aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-03 02:20:09 -0700
committerfriendica <info@friendica.com>2013-10-03 02:20:09 -0700
commit963e0cefbb4c5ac400d7b43f7d8862474c0e9654 (patch)
tree5ee68bbf6c7fcdc35c4c7eb9fd3324d5aa9ea264
parente1fb45bc4a17fe4b16b6f4d49f620d56009baa96 (diff)
downloadvolse-hubzilla-963e0cefbb4c5ac400d7b43f7d8862474c0e9654.tar.gz
volse-hubzilla-963e0cefbb4c5ac400d7b43f7d8862474c0e9654.tar.bz2
volse-hubzilla-963e0cefbb4c5ac400d7b43f7d8862474c0e9654.zip
get rid of pink search bar when not using redbasic "red"
-rw-r--r--library/jslider/img/jslider.pngbin841 -> 832 bytes
-rw-r--r--version.inc2
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/php/style.php4
4 files changed, 6 insertions, 2 deletions
diff --git a/library/jslider/img/jslider.png b/library/jslider/img/jslider.png
index 215e11a23..280eb7188 100644
--- a/library/jslider/img/jslider.png
+++ b/library/jslider/img/jslider.png
Binary files differ
diff --git a/version.inc b/version.inc
index bd22a63e0..24a7f2c3a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-10-02.454
+2013-10-03.455
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3f4a71104..f929087b1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2041,7 +2041,7 @@ a.mail-list-link {
font-size: 0.8em;
border-radius: 14px;
border: none;
- background-color: #FFDDDD;
+ background-color: $search_background;
color: #eec;
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d97e85668..cb17f8298 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -16,14 +16,17 @@
$nav_bg_2 = "#b00";
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
+ $search_background = '#FFDDDD';
}
if ($nav_colour == "black") {
$nav_bg_1 = $nav_bg_3 = "#000";
$nav_bg_2 = $nav_bg_4 = "#222";
+ $search_background = '#EEEEEE';
}
if ($nav_colour == "silver") {
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
+ $search_background = '#EEEEEE';
}
$background_colour = get_pconfig($uid, "redbasic", "background_colour");
@@ -73,6 +76,7 @@ $options = array (
'$nav_bg_2' => $nav_bg_2,
'$nav_bg_3' => $nav_bg_3,
'$nav_bg_4' => $nav_bg_4,
+'$search_background' => $search_background,
'$background_colour' => $background_colour,
'$background_image' => $background_image,
'$item_colour' => $item_colour,