Skip to content
Snippets Groups Projects
Commit db30f94f authored by Bernhard Posselt's avatar Bernhard Posselt
Browse files

Merge pull request #1697 from owncloud/navigation-details 

Navigation details
parents f4c9d4c0 3f09cc13
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
core/css/styles.css
+ 11
− 2
View file @ db30f94f
...@@ -16,7 +16,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan ...@@ -16,7 +16,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan
/* HEADERS */ /* 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; #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); -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 */ background:#1d2d44; /* Old browsers */
...@@ -229,8 +232,9 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } ...@@ -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%; 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; 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; -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 { #navigation a {
display:block; padding:8px 0 4px; display:block; padding:8px 0 4px;
text-decoration:none; font-size:10px; text-align:center; text-decoration:none; font-size:10px; text-align:center;
...@@ -241,6 +245,9 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } ...@@ -241,6 +245,9 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
#navigation a.active { opacity:1; } #navigation a.active { opacity:1; }
#navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; } #navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; }
#navigation li:first-child a { padding-top:16px; } #navigation li:first-child a { padding-top:16px; }
/* USER MENU */
#settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; } #settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
#expand { padding:15px; cursor:pointer; font-weight:bold; } #expand { padding:15px; cursor:pointer; font-weight:bold; }
#expand:hover, #expand:focus, #expand:active { color:#fff; } #expand:hover, #expand:focus, #expand:active { color:#fff; }
...@@ -249,6 +256,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } ...@@ -249,6 +256,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
#expanddiv { #expanddiv {
position:absolute; right:0; top:45px; z-index:76; display:none; 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-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 { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; opacity:.7; }
#expanddiv a img { margin-bottom:-3px; } #expanddiv a img { margin-bottom:-3px; }
......
core/img/noise.png
+ 0
− 0
View replaced file @ f4c9d4c0 View file @ db30f94f
core/img/noise.png

930 KiB | W: | H:

core/img/noise.png

3.05 KiB | W: | H:

core/img/noise.png
core/img/noise.png
core/img/noise.png
core/img/noise.png
  • 2-up
  • Swipe
  • Onion skin
core/js/js.js
+ 2
− 2
View file @ db30f94f
...@@ -663,14 +663,14 @@ $(document).ready(function(){ ...@@ -663,14 +663,14 @@ $(document).ready(function(){
} }
}); });
$('#settings #expand').click(function(event) { $('#settings #expand').click(function(event) {
$('#settings #expanddiv').slideToggle(); $('#settings #expanddiv').slideToggle(200);
event.stopPropagation(); event.stopPropagation();
}); });
$('#settings #expanddiv').click(function(event){ $('#settings #expanddiv').click(function(event){
event.stopPropagation(); event.stopPropagation();
}); });
$(window).click(function(){//hide the settings menu when clicking outside it $(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 // all the tipsy stuff needs to be here (in reverse order) to work
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment