From 457a7d4baaf6a6e493dd604907d4c73890946f13 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Nov 2013 13:34:31 +0100 Subject: [PATCH 1/5] always show app navigation scrollbar when too many apps in there --- core/css/styles.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 5c0aa1fedc..e1e97ba74b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -568,14 +568,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; + height: 100%; + background: #383c43 url('../img/noise.png') repeat; + overflow-y: auto; + -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%; } From f9f123c6f6f9491c1141b423fca819874f387921 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Nov 2013 14:09:15 +0100 Subject: [PATCH 2/5] prevent shift of app titles caused by scrollbar --- core/css/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/styles.css b/core/css/styles.css index e1e97ba74b..9e8337d689 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -586,6 +586,7 @@ 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; + padding-left: 8px; /* prevent shift caused by scrollbar */ } /* icon opacity and hover effect */ From 3360719bbf3cb9a2b086b10b8b1a0a21e78531b4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Nov 2013 17:21:23 +0100 Subject: [PATCH 3/5] prevent shift of app names caused by scrollbar, part 2 --- core/css/styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 9e8337d689..c9820c4ae3 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -586,7 +586,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; - padding-left: 8px; /* prevent shift caused by scrollbar */ + /* prevent shift caused by scrollbar */ + padding-left: 8px; + width: 64px; } /* icon opacity and hover effect */ From 41c67520302901cdcd9acced16fc315164c701de Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 26 Nov 2013 18:32:04 +0100 Subject: [PATCH 4/5] fix navbar --- core/css/styles.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index c9820c4ae3..6cfbad2b56 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -568,7 +568,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } width: 80px; margin-top:45px; z-index: 75; - height: 100%; background: #383c43 url('../img/noise.png') repeat; overflow-y: auto; -moz-box-sizing:border-box; box-sizing:border-box; From 6b3b3d8af4635f24fe8f5d7dc13ce8db81a494af Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Nov 2013 16:45:04 +0100 Subject: [PATCH 5/5] Fix for IE - an ugly horizontal scrollbar appears * for IE9 the nav bar was too narrow * for other IEs the width of each app element was to wide and cause the horizontal scoll bar - now this content is hidden like before this PR --- core/css/fixes.css | 5 +++++ core/css/styles.css | 1 + 2 files changed, 6 insertions(+) diff --git a/core/css/fixes.css b/core/css/fixes.css index 5f2cb6049f..3cdeccb038 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -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; +} diff --git a/core/css/styles.css b/core/css/styles.css index 6cfbad2b56..2eda25b2ef 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -570,6 +570,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } z-index: 75; 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;