fixed settings hover, now whole row sensitive and fading not jerky
This commit is contained in:
parent
b669c846b0
commit
5868199e85
|
@ -95,8 +95,9 @@ label.infield { cursor: text !important; }
|
||||||
#navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
|
#navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
|
||||||
#navigation a.active { background-color:#ddd; }
|
#navigation a.active { background-color:#ddd; }
|
||||||
#navigation #settings { position:absolute; bottom:3.5em; width:100%; }
|
#navigation #settings { position:absolute; bottom:3.5em; width:100%; }
|
||||||
#expand { margin:0 0 .2em 1.2em; cursor:pointer; }
|
#expand { position:relative; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; }
|
||||||
#expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
|
#expand+span { position:absolute; margin:-1.7em 0 0 2.5em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
|
||||||
|
#expand:hover+span, #expand+span:hover { opacity:1; cursor:pointer; }
|
||||||
#logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
|
#logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -406,9 +406,6 @@ $(document).ready(function(){
|
||||||
$('#settings #expanddiv').click(function(event){
|
$('#settings #expanddiv').click(function(event){
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
});
|
});
|
||||||
$('#settings #expand').hover(function(){
|
|
||||||
$('#settings #expand+span').fadeToggle();
|
|
||||||
});
|
|
||||||
$(window).click(function(){//hide the settings menu when clicking oustide it
|
$(window).click(function(){//hide the settings menu when clicking oustide it
|
||||||
if($('body').attr("id")=="body-user"){
|
if($('body').attr("id")=="body-user"){
|
||||||
$('#settings #expanddiv').slideUp();
|
$('#settings #expanddiv').slideUp();
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
<ul id="settings" class="svg">
|
<ul id="settings" class="svg">
|
||||||
<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
|
<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
|
||||||
<span style="display:none;"><?php echo $l->t('Settings');?></span>
|
<span><?php echo $l->t('Settings');?></span>
|
||||||
<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
|
<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
|
||||||
<?php foreach($_['settingsnavigation'] as $entry):?>
|
<?php foreach($_['settingsnavigation'] as $entry):?>
|
||||||
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
|
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
|
||||||
|
|
Loading…
Reference in New Issue