mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent a03ba06dcd 6b3b3d8af4
commit 1dc931b778
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/css/fixes.css
View File

@ -53,3 +53,8 @@
.ie8 fieldset .warning, .ie8 #body-login .error { .ie8 fieldset .warning, .ie8 #body-login .error {
background-color: #1B314D; 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;
}

10
core/css/styles.css
View File

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