Merge pull request #5984 from owncloud/nav-scrollbar

always show app navigation scrollbar when too many apps in there
This commit is contained in:
Frank Karlitschek 2013-11-29 03:27:50 -08:00
commit 1dc931b778
2 changed files with 12 additions and 5 deletions

View File

@ -53,3 +53,8 @@
.ie8 fieldset .warning, .ie8 #body-login .error {
background-color: #1B314D;
}
/* in IE9 the nav bar on the left side is too narrow and leave a white area - original width is 80px */
.ie9 #navigation {
width: 100px;
}

View File

@ -577,14 +577,13 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
width: 80px;
margin-top:45px;
z-index: 75;
background:#383c43 url('../img/noise.png') repeat;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
background: #383c43 url('../img/noise.png') repeat;
overflow-y: auto;
overflow-x: hidden;
-moz-box-sizing:border-box; box-sizing:border-box;
/* prevent ugly selection effect on accidental selection */
-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
}
#apps {
height: 100%;
}
@ -596,6 +595,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
color: #fff;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
padding-bottom: 10px;
/* prevent shift caused by scrollbar */
padding-left: 8px;
width: 64px;
}
/* icon opacity and hover effect */