aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-10 20:17:41 -0700
committerfriendica <info@friendica.com>2013-10-10 20:17:41 -0700
commitc52db29ff56abfed857b11d8b9cbfb5cb4d7d598 (patch)
treeeb9faf91bfcf8a343fff9a22453c1302fad2e793
parent993e90e9746b6a6fbc763200fefb763439770515 (diff)
downloadvolse-hubzilla-c52db29ff56abfed857b11d8b9cbfb5cb4d7d598.tar.gz
volse-hubzilla-c52db29ff56abfed857b11d8b9cbfb5cb4d7d598.tar.bz2
volse-hubzilla-c52db29ff56abfed857b11d8b9cbfb5cb4d7d598.zip
set the colour of the active nav element so it doesn't get washed out
-rw-r--r--view/theme/redbasic/css/style.css4
-rw-r--r--view/theme/redbasic/js/redbasic.js26
-rw-r--r--view/theme/redbasic/php/style.php8
-rwxr-xr-xview/tpl/saved_searches_aside.tpl4
4 files changed, 24 insertions, 18 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e8abec3c6..1c75c9d58 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3003,8 +3003,8 @@ nav:hover .nav-menu {
/* border-bottom: 3px solid #f00; */
}
-nav .nav-menu.active a {
- color: #444444;
+nav .nav-menu.active i {
+ color: $active_colour;
}
nav .nav-notify {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 42a55c409..e7a682911 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -66,22 +66,24 @@ $('.sidebar-group-element').hover(
);
-//$('.savedsearchdrop').hover(
+//$('.saved-search-li a').hover(
// function() {
-// $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+// id = $(this).attr('id');
+// $('#dropicon-' + id).css('visibility','visible');},
// function() {
-// $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+// id = $(this).attr('id');
+// $('#dropicon-' + id).css('visibility','hidden');}
// );
-$('.savedsearchterm').hover(
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).addClass('searchdrop'); $('#dropicon-' + id).removeClass('iconspacer');},
-
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).removeClass('searchdrop'); $('#dropicon-' + id).addClass('iconspacer');}
- );
+//$('.savedsearchterm').hover(
+// function() {
+// id = $(this).attr('id');
+// $('#dropicon-' + id).css('visibility','visible');},
+//
+// function() {
+// id = $(this).attr('id');
+// $('#dropicon-' + id).css('visibility','hidden');
+// });
});
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2afcbae66..b80a3e764 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -17,12 +17,14 @@
$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";
@@ -85,7 +87,8 @@
$radius = "5";
if (! $shadow)
$shadow = "0";
-
+ if(! $active_colour)
+ $active_colour = '#FFFFFF';
// Apply the settings
@@ -105,7 +108,8 @@ $options = array (
'$font_size' => $font_size,
'$font_colour' => $font_colour,
'$radius' => $radius,
-'$shadow' => $shadow
+'$shadow' => $shadow,
+'$active_colour' => $active_colour
);
echo str_replace(array_keys($options), array_values($options), $x);
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index 0dabca4a6..ea336f969 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -4,8 +4,8 @@
<ul id="saved-search-ul">
{{foreach $saved as $search}}
- <li class="saved-search-li clear">
- <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop"></i></a>
+ <li id="search-term-{{$search.id}}" class="saved-search-li clear">
+ <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
</li>
{{/foreach}}