Commit 8b9a5f55 authored by Zach Copley's avatar Zach Copley

Update design settings CSS output

parent 895447f3
<?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);
......
......@@ -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});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment