GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Update design settings CSS output

This commit is contained in:
Zach Copley 2011-06-06 13:18:56 -07:00
parent 31a92ede44
commit f3eb83d8a5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Design.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
* StatusNet - the distributed open-source microblogging tool * 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 * 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 * 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); $ccolor = Design::toWebColor($this->contentcolor);
if (!empty($ccolor)) { if (!empty($ccolor)) {
$css .= '#content, #site_nav_local_views .current a { background-color: #'; $css .= '#content { background-color: #';
$css .= $ccolor->hexValue() . '} '."\n"; $css .= $ccolor->hexValue() . '} '."\n";
} }
$sbcolor = Design::toWebColor($this->sidebarcolor); $sbcolor = Design::toWebColor($this->sidebarcolor);
if (!empty($sbcolor)) { 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); $tcolor = Design::toWebColor($this->textcolor);

8
js/userdesign.go.js
View File

@ -2,7 +2,7 @@
* *
* @package StatusNet * @package StatusNet
* @author Sarven Capadisli <csarven@status.net> * @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 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
@ -16,7 +16,7 @@ $(document).ready(function() {
$(E).val(rgb2hex($('#content').css('background-color'))); $(E).val(rgb2hex($('#content').css('background-color')));
break; break;
case 3: 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; break;
case 4: case 4:
$(E).val(rgb2hex($('html body').css('color'))); $(E).val(rgb2hex($('html body').css('color')));
@ -45,10 +45,10 @@ $(document).ready(function() {
$('body').css({'background-color':C}); $('body').css({'background-color':C});
break; break;
case 2: case 2:
$('#content, #site_nav_local_views .current a').css({'background-color':C}); $('#content').css({'background-color':C});
break; break;
case 3: case 3:
$('#aside_primary').css({'background-color':C}); $('#aside_primary_wrapper, #site_nav_local_views_wrapper').css({'background-color':C});
break; break;
case 4: case 4:
$('html body').css({'color':C}); $('html body').css({'color':C});