Merge pull request #1697 from owncloud/navigation-details

Navigation details

3 files changed, 13 insertions, 4 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index b41c205c21b..8290424acbe 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -16,7 +16,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan
 
 
 /* HEADERS */
-#body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
+#body-user #header, #body-settings #header {
+	position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em;
+	background:#1d2d44 url('../img/noise.png') repeat;
+	-moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
 #body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em;
  -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
 background:#1d2d44; /* Old browsers */
@@ -229,8 +232,9 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 	position:fixed; top:3.5em; float:left; width:64px; padding:0; z-index:75; height:100%;
 	background:#383c43 url('../img/noise.png') repeat; border-right:1px #333 solid;
 	-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
-	overflow-x:scroll;
+	overflow:hidden;
 }
+#navigation:hover { overflow-y:auto; }
 #navigation a {
 	display:block; padding:8px 0 4px;
 	text-decoration:none; font-size:10px; text-align:center;
@@ -241,6 +245,9 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 	#navigation a.active { opacity:1; }
 	#navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; }
 	#navigation li:first-child a { padding-top:16px; }
+
+
+/* USER MENU */
 #settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
 #expand { padding:15px; cursor:pointer; font-weight:bold; }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
@@ -249,6 +256,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 #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);
+	background:#383c43 url('../img/noise.png') repeat; border-bottom:1px #333 solid; border-left:border-bottom:1px #333 solid;
+	-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px 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; }
diff --git a/core/img/noise.png b/core/img/noise.png
index 8fdda17b5e3..271dd5ebcfb 100644
--- a/core/img/noise.png
+++ b/core/img/noise.png
diff --git a/core/js/js.js b/core/js/js.js
index ae23c955c38..6d5d65403fb 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -663,14 +663,14 @@ $(document).ready(function(){
 		}
 	});
 	$('#settings #expand').click(function(event) {
-		$('#settings #expanddiv').slideToggle();
+		$('#settings #expanddiv').slideToggle(200);
 		event.stopPropagation();
 	});
 	$('#settings #expanddiv').click(function(event){
 		event.stopPropagation();
 	});
 	$(window).click(function(){//hide the settings menu when clicking outside it
-		$('#settings #expanddiv').slideUp();
+		$('#settings #expanddiv').slideUp(200);
 	});
 
 	// all the tipsy stuff needs to be here (in reverse order) to work