set the colour of the active nav element so it doesn't get washed out

This commit is contained in:
friendica 2013-10-10 20:17:41 -07:00
parent 993e90e974
commit c52db29ff5
4 changed files with 24 additions and 18 deletions

View file

@ -3003,8 +3003,8 @@ nav:hover .nav-menu {
/* border-bottom: 3px solid #f00; */ /* border-bottom: 3px solid #f00; */
} }
nav .nav-menu.active a { nav .nav-menu.active i {
color: #444444; color: $active_colour;
} }
nav .nav-notify { nav .nav-notify {

View file

@ -66,22 +66,24 @@ $('.sidebar-group-element').hover(
); );
//$('.savedsearchdrop').hover( //$('.saved-search-li a').hover(
// function() { // function() {
// $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, // id = $(this).attr('id');
// $('#dropicon-' + id).css('visibility','visible');},
// function() { // function() {
// $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} // id = $(this).attr('id');
// $('#dropicon-' + id).css('visibility','hidden');}
// ); // );
$('.savedsearchterm').hover( //$('.savedsearchterm').hover(
function() { // function() {
id = $(this).attr('id'); // id = $(this).attr('id');
$('#dropicon-' + id).addClass('searchdrop'); $('#dropicon-' + id).removeClass('iconspacer');}, // $('#dropicon-' + id).css('visibility','visible');},
//
function() { // function() {
id = $(this).attr('id'); // id = $(this).attr('id');
$('#dropicon-' + id).removeClass('searchdrop'); $('#dropicon-' + id).addClass('iconspacer');} // $('#dropicon-' + id).css('visibility','hidden');
); // });
}); });

View file

@ -17,12 +17,14 @@
$nav_bg_3 = "#f00"; $nav_bg_3 = "#f00";
$nav_bg_4 = "#b00"; $nav_bg_4 = "#b00";
$search_background = '#FFDDDD'; $search_background = '#FFDDDD';
$active_colour = '#444444';
} }
if ($nav_colour == "black") { if ($nav_colour == "black") {
$nav_bg_1 = $nav_bg_3 = "#000"; $nav_bg_1 = $nav_bg_3 = "#000";
$nav_bg_2 = $nav_bg_4 = "#222"; $nav_bg_2 = $nav_bg_4 = "#222";
$search_background = '#EEEEEE'; $search_background = '#EEEEEE';
$active_colour = '#AAAAAA';
} }
if ($nav_colour == "silver") { if ($nav_colour == "silver") {
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
@ -85,7 +87,8 @@
$radius = "5"; $radius = "5";
if (! $shadow) if (! $shadow)
$shadow = "0"; $shadow = "0";
if(! $active_colour)
$active_colour = '#FFFFFF';
// Apply the settings // Apply the settings
@ -105,7 +108,8 @@ $options = array (
'$font_size' => $font_size, '$font_size' => $font_size,
'$font_colour' => $font_colour, '$font_colour' => $font_colour,
'$radius' => $radius, '$radius' => $radius,
'$shadow' => $shadow '$shadow' => $shadow,
'$active_colour' => $active_colour
); );
echo str_replace(array_keys($options), array_values($options), $x); echo str_replace(array_keys($options), array_values($options), $x);

View file

@ -4,7 +4,7 @@
<ul id="saved-search-ul"> <ul id="saved-search-ul">
{{foreach $saved as $search}} {{foreach $saved as $search}}
<li class="saved-search-li clear"> <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 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> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
</li> </li>