From 0c442e459e42b5d5aa168f7e2d3a0ff9f6bb0cd5 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 19 May 2009 17:05:30 +0000
Subject: Added reset button Rearranged swatch layout Added background image
 upload input file

---
 js/farbtastic/farbtastic.go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/farbtastic')

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 64dd7db20..77e213513 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
     $('#color-picker').hide();
 
     var f = $.farbtastic('#color-picker', UpdateColors);
-    var swatches = $('#settings_design_color input');
+    var swatches = $('#settings_design_color .swatch');
 
     swatches
         .each(UpdateColors)
-- 
cgit v1.2.3-54-g00ecf


From 09e95cc33fb2228066d524e399bcc549e85eb565 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Tue, 19 May 2009 17:31:43 +0000
Subject: Fixed array index

---
 js/farbtastic/farbtastic.go.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'js/farbtastic')

diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 77e213513..e298c1dab 100644
--- a/js/farbtastic/farbtastic.go.js
+++ b/js/farbtastic/farbtastic.go.js
@@ -7,19 +7,19 @@ $(document).ready(function() {
             UpdateSwatch(S);
 
             switch (parseInt(f.linked.id.slice(-1))) {
-                case 1: default:
+                case 0: default:
                     $('body').css({'background-color':C});
                     break;
-                case 2:
+                case 1:
                     $('#content').css({'background-color':C});
                     break;
-                case 3:
+                case 2:
                     $('#aside_primary').css({'background-color':C});
                     break;
-                case 4:
+                case 3:
                     $('body').css({'color':C});
                     break;
-                case 5:
+                case 4:
                     $('a').css({'color':C});
                     break;
             }
-- 
cgit v1.2.3-54-g00ecf