diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 14:28:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 14:28:31 +0200 |
| commit | 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (patch) | |
| tree | 081c20bfc9a165b10fbc2cbb64a07040ad87027d /core | |
| parent | e292b1fcdbe15d3a048c89f1825cb9ae8831edbb (diff) | |
| parent | 897261daf48a0b60227c7fce248cfd1c56fe68b1 (diff) | |
| download | nextcloud-server-8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0.tar.gz nextcloud-server-8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0.zip | |
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 5 | ||||
| -rw-r--r-- | core/js/js.js | 7 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 5e3bbfcf182..a4964480499 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..51dcbe5413e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -69,10 +69,10 @@ OC={ * @param file the name of the image file * @return string * - * if no extention is given for the image, it will automatically decide between .png and .svg based on what the browser supports + * if no extension is given for the image, it will automatically decide between .png and .svg based on what the browser supports */ imagePath:function(app,file){ - if(file.indexOf('.')==-1){//if no extention is given, use png or svg depending on browser support + if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support file+=(SVGSupport())?'.svg':'.png'; } return OC.filePath(app,'img',file); @@ -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> |