diff options
author | friendica <info@friendica.com> | 2013-10-11 20:44:54 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-10-11 20:44:54 -0700 |
commit | 0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0 (patch) | |
tree | 297b7be84af49503284ee393d7a6431c60e82a68 /view/theme/redbasic/php/style.php | |
parent | 7cd1bd59b2544aae52a399761849f46bd7b8a066 (diff) | |
parent | 899ebe9cbc99b143a485e10e8c246bd6411eefc3 (diff) | |
download | volse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.tar.gz volse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.tar.bz2 volse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.zip |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/theme/redbasic/php/style.php')
-rw-r--r-- | view/theme/redbasic/php/style.php | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b80a3e764..b5d020937 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -11,25 +11,6 @@ // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // wants to implement that $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); - if ($nav_colour == "red") { - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - $search_background = '#FFDDDD'; - $active_colour = '#444444'; - } - - if ($nav_colour == "black") { - $nav_bg_1 = $nav_bg_3 = "#000"; - $nav_bg_2 = $nav_bg_4 = "#222"; - $search_background = '#EEEEEE'; - $active_colour = '#AAAAAA'; - } - if ($nav_colour == "silver") { - $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; - $search_background = '#EEEEEE'; - } // Load the owners pconfig $schema = get_pconfig($uid,'redbasic','schema'); @@ -90,7 +71,31 @@ if(! $active_colour) $active_colour = '#FFFFFF'; + +// Nav colours have nested values, so we have to define the actual variables +// used in the CSS from the higher level "red", "black", etc here + if ($nav_colour == "red") { + $nav_bg_1 = "#f88"; + $nav_bg_2 = "#b00"; + $nav_bg_3 = "#f00"; + $nav_bg_4 = "#b00"; + $search_background = '#FFDDDD'; + $active_colour = '#444444'; + } + + if ($nav_colour == "black") { + $nav_bg_1 = $nav_bg_3 = "#000"; + $nav_bg_2 = $nav_bg_4 = "#222"; + $search_background = '#EEEEEE'; + $active_colour = '#AAAAAA'; + } + if ($nav_colour == "silver") { + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + $search_background = '#EEEEEE'; + } + + // Apply the settings if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); |