summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-02-06 16:03:01 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-02-06 16:03:01 +0100
commit8ea6398e48dc875a5a95c900cc210a36e4da1d89 (patch)
tree44fbf9f5fd4caa93fb9a6ce00ff8c03e3ba1a623 /core
parent9e08f85c5e8b57d759cecc9ca145a816e121fe6c (diff)
downloadnextcloud-server-8ea6398e48dc875a5a95c900cc210a36e4da1d89.tar.gz
nextcloud-server-8ea6398e48dc875a5a95c900cc210a36e4da1d89.zip
collapse user menu when inside one of the settings sections
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css5
-rw-r--r--core/templates/layout.user.php2
2 files changed, 5 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 481443a19bd..c2f4f8b55bd 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -234,7 +234,10 @@ fieldset.warning legend { color:#b94a48 !important; }
#expand:hover, #expand:focus, #expand:active { color:#fff; }
#expand img { opacity:.7; margin-bottom:-2px; }
#expand:hover img, #expand:focus img, #expand:active img { opacity:1; }
-#expanddiv { position:absolute; right:0; top:45px; background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); z-index:76; }
+#expanddiv {
+ position:absolute; right:0; top:45px; z-index:76; display:none;
+ background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
+}
#expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; opacity:.7; }
#expanddiv a img { margin-bottom:-3px; }
#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { opacity:1; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index de505486f75..2547278547f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -35,7 +35,7 @@
<?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?>
<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
</span>
- <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
+ <div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
<li>
<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>