diff options
| author | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 12:23:01 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 13:34:30 +0200 |
| commit | 5868199e85b88f81f3b75fa2d203bb2074cb5215 (patch) | |
| tree | 74dd4ea587d4eb80920b0b04d06598f47c04cab8 /core | |
| parent | b669c846b097b6f16d99191fb2ecfe0a408ea589 (diff) | |
| download | nextcloud-server-5868199e85b88f81f3b75fa2d203bb2074cb5215.tar.gz nextcloud-server-5868199e85b88f81f3b75fa2d203bb2074cb5215.zip | |
fixed settings hover, now whole row sensitive and fading not jerky
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 5 | ||||
| -rw-r--r-- | core/js/js.js | 3 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 45bfb285dd6..89e5c91e3cf 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -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 { background-color:#ddd; } #navigation #settings { position:absolute; bottom:3.5em; width:100%; } -#expand { margin:0 0 .2em 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 { position:relative; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; } +#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; } diff --git a/core/js/js.js b/core/js/js.js index e3941fba6d5..2e65dfac507 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -406,9 +406,6 @@ $(document).ready(function(){ $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $('#settings #expand').hover(function(){ - $('#settings #expand+span').fadeToggle(); - }); $(window).click(function(){//hide the settings menu when clicking oustide it if($('body').attr("id")=="body-user"){ $('#settings #expanddiv').slideUp(); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 85cf0899792..61eb0de9f42 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -44,7 +44,7 @@ <ul id="settings" class="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;"'; ?>> <?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> |