aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-02 17:09:25 -0800
committerfriendica <info@friendica.com>2014-02-02 17:09:25 -0800
commit732a4b898afc7bc4d5b96f1b0f50f866c2068e06 (patch)
tree379b61a26039b2c4ea15b90925579cf9a9b7811c
parent3eed73d5195bbf736e2e243b512155b6933108a1 (diff)
parentd2b55f5eeab330b08410424d96211f40050d7a1f (diff)
downloadvolse-hubzilla-732a4b898afc7bc4d5b96f1b0f50f866c2068e06.tar.gz
volse-hubzilla-732a4b898afc7bc4d5b96f1b0f50f866c2068e06.tar.bz2
volse-hubzilla-732a4b898afc7bc4d5b96f1b0f50f866c2068e06.zip
Merge pull request #300 from tazmandevil/master
added Thomas' additional navbar colours from APW to redbasic
-rw-r--r--view/theme/redbasic/php/config.php14
-rw-r--r--view/theme/redbasic/php/style.php32
2 files changed, 43 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index d6adf5381..68a72fffd 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -74,9 +74,17 @@ function redbasic_form(&$a, $arr) {
$nav_colours = array (
'' => t('Scheme Default'),
- 'red' => t('red'),
- 'black' => t('black'),
- 'silver' => t('silver'),
+ 'red' => 'red',
+ 'pink' => 'pink',
+ 'green' => 'green',
+ 'blue' => 'blue',
+ 'purple' => 'purple',
+ 'black' => 'black',
+ 'orange' => 'orange',
+ 'brown' => 'brown',
+ 'grey' => 'grey',
+ 'gold' => 'gold',
+ 'silver' => t('silver'),
);
if(feature_enabled(local_user(),'expert'))
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 981aaddb2..aec27961e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -133,6 +133,38 @@
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
$search_background = '#EEEEEE';
}
+ if($nav_colour === "pink") {
+ $nav_bg_1 = $nav_bg_3 = "#FFC1CA";
+ $nav_bg_2 = $nav_bg_4 = "#FFC1CA";
+ }
+ if($nav_colour === "green") {
+ $nav_bg_1 = $nav_bg_3 = "#5CD65C";
+ $nav_bg_2 = $nav_bg_4 = "#5CD65C";
+ }
+ if($nav_colour === "blue") {
+ $nav_bg_1 = $nav_bg_3 = "#1872a2";
+ $nav_bg_2 = $nav_bg_4 = "#1872a2";
+ }
+ if($nav_colour === "purple") {
+ $nav_bg_1 = $nav_bg_3 = "#551A8B";
+ $nav_bg_2 = $nav_bg_4 = "#551A8B";
+ }
+ if($nav_colour === "orange") {
+ $nav_bg_1 = $nav_bg_3 = "#FF3D0D";
+ $nav_bg_2 = $nav_bg_4 = "#FF3D0D";
+ }
+ if($nav_colour === "brown") {
+ $nav_bg_1 = $nav_bg_3 = "#330000";
+ $nav_bg_2 = $nav_bg_4 = "#330000";
+ }
+ if($nav_colour === "grey") {
+ $nav_bg_1 = $nav_bg_3 = "#2e2f2e";
+ $nav_bg_2 = $nav_bg_4 = "#2e2f2e";
+ }
+ if($nav_colour === "gold") {
+ $nav_bg_1 = $nav_bg_3 = "#FFAA00";
+ $nav_bg_2 = $nav_bg_4 = "#FFAA00";
+ }
// Apply the settings