summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-20 00:56:35 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-20 00:56:35 +0000
commitf90d0ac6c8daae0f939df75b120368976f7b4a30 (patch)
tree5528d36ca1c4d86c268069b4bcf4a69ffea59fc8 /js
parentf841dd6af4a0367f5589fa2b18a0043c0133cdd2 (diff)
parent8cc8f9fd0c0ad8d1c38bd0c113f9f0a4d7918256 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'js')
-rw-r--r--js/farbtastic/farbtastic.go.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/farbtastic/farbtastic.go.js b/js/farbtastic/farbtastic.go.js
index 64dd7db20..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;
}
@@ -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)