From f3eb83d8a595a9a8236235c878b5876f88ddda91 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 6 Jun 2011 13:18:56 -0700
Subject: [PATCH] Update design settings CSS output

---
 classes/Design.php  | 6 +++---
 js/userdesign.go.js | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/Design.php b/classes/Design.php
index f4834c714e..464e244b1a 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2009-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -66,14 +66,14 @@ class Design extends Memcached_DataObject
         $ccolor  = Design::toWebColor($this->contentcolor);
 
         if (!empty($ccolor)) {
-            $css .= '#content, #site_nav_local_views .current a { background-color: #';
+            $css .= '#content { background-color: #';
             $css .= $ccolor->hexValue() . '} '."\n";
         }
 
         $sbcolor = Design::toWebColor($this->sidebarcolor);
 
         if (!empty($sbcolor)) {
-            $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
+            $css .= '#aside_primary_wrapper, #site_nav_local_views_wrapper { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
         }
 
         $tcolor  = Design::toWebColor($this->textcolor);
diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index eb4dece095..f6c696759d 100644
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -2,7 +2,7 @@
  *
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -16,7 +16,7 @@ $(document).ready(function() {
                 $(E).val(rgb2hex($('#content').css('background-color')));
                 break;
             case 3:
-                $(E).val(rgb2hex($('#aside_primary').css('background-color')));
+                $(E).val(rgb2hex($('#aside_primary_wrapper, #site_nav_local_views_wrapper').css('background-color')));
                 break;
             case 4:
                 $(E).val(rgb2hex($('html body').css('color')));
@@ -45,10 +45,10 @@ $(document).ready(function() {
                 $('body').css({'background-color':C});
                 break;
             case 2:
-                $('#content, #site_nav_local_views .current a').css({'background-color':C});
+                $('#content').css({'background-color':C});
                 break;
             case 3:
-                $('#aside_primary').css({'background-color':C});
+                $('#aside_primary_wrapper, #site_nav_local_views_wrapper').css({'background-color':C});
                 break;
             case 4:
                 $('html body').css({'color':C});