From aca2c93839c9d462f93dea0e09049b10a72386fa Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Fri, 3 May 2013 16:31:18 +0530 Subject: [PATCH 1/7] Removes Borders from the left navigation. --- core/css/styles.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 6c9d00114a..670942738f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -500,12 +500,6 @@ div.crumb:active { /* special rules for first-level entries and folders */ #app-navigation > ul > li { background-color: #eee; - border-top: 1px solid #fff; - border-bottom: 1px solid #ddd; -} -#app-navigation > ul > .active { - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; } #app-navigation .with-icon a { @@ -527,10 +521,6 @@ div.crumb:active { #app-navigation li:hover > a { background-color: #ddd; } -#app-navigation > ul > li:hover { - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; -} #app-navigation .collapse { display: none; /* hide collapse button intially */ @@ -592,7 +582,6 @@ div.crumb:active { #app-navigation > ul .open:hover { -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; - border-top: 1px solid #ccc; } #app-navigation > ul .open ul { From 7eb6e8d5b58013661c8dca9d4f1cc34c1565816a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 19:37:22 +0200 Subject: [PATCH 2/7] app styles: remove bottom padding. Settings should be last in list instead of permanent --- core/css/styles.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 670942738f..154f73f27a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -475,7 +475,6 @@ div.crumb:active { width: 250px; height: 100%; float: left; - padding-bottom: 32px; -moz-box-sizing: border-box; box-sizing: border-box; background-color: #f8f8f8; border-right: 1px solid #ccc; From 87d1e72f9c9c4afc11f302409e00ff6825a9f5ef Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 20:19:25 +0200 Subject: [PATCH 3/7] more whitespace WIP --- core/css/styles.css | 63 +++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 154f73f27a..1eb55aea78 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -148,7 +148,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #content { position:relative; height:100%; width:100%; } #content .hascontrols { position: relative; top: 2.9em; } #content-wrapper { - position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px; + position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px; -moz-box-sizing:border-box; box-sizing:border-box; } #leftcontent, .leftcontent { @@ -274,16 +274,29 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac /* NAVIGATION ------------------------------------------------------------- */ #navigation { - position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%; + position: fixed; + float: left; + width: 80px; + padding-top: 3.5em; + z-index: 75; + height: 100%; background:#383c43 url('../img/noise.png') repeat; -moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000; overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box; } -#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */ +#navigation:hover { + overflow-y: auto; /* show scrollbar only on hover */ +} +#navigation li { + padding: 6px 0; /* some whitespace between apps */ +} #navigation a span { - display:block; - text-decoration:none; font-size:10px; text-align:center; - color:#fff; text-shadow:#000 0 -1px 0; + display: block; + text-decoration: none; + font-size: 11px; + text-align: center; + color: #fff; + text-shadow: #000 0 -1px 0; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ } @@ -309,12 +322,12 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac filter: alpha(opacity=100); opacity: 1; } - - /* positioning */ #navigation .icon { - display:block; - width:32px; height:32px; - margin:0 16px 0; padding:8px 0 4px; + display: block; + width: 32px; + height: 32px; + margin-left: 24px; + padding: 8px 0 4px; } #navigation li:first-child a { padding-top:16px; } @@ -472,7 +485,7 @@ div.crumb:active { /* Navigation: folder like structure */ #app-navigation { - width: 250px; + width: 300px; height: 100%; float: left; -moz-box-sizing: border-box; box-sizing: border-box; @@ -491,7 +504,8 @@ div.crumb:active { text-shadow: 0 1px 0 rgba(255,255,255,.9); } #app-navigation .active, -#app-navigation .active a { /* active navigation entry or folder */ +#app-navigation .active a, +#app-navigation li:hover > a { background-color: #ddd; text-shadow: 0 1px 0 rgba(255,255,255,.7); } @@ -502,36 +516,35 @@ div.crumb:active { } #app-navigation .with-icon a { - padding-left: 32px; - background-size: 16px 16px; background-position: 10px center; background-repeat: no-repeat; + padding-left: 44px; + background-size: 16px 16px; + background-position: 14px center; + background-repeat: no-repeat; } #app-navigation li > a { display: block; width: 100%; - padding: 0 16px; + height: 44px; + padding-top: 12px; overflow: hidden; -moz-box-sizing: border-box; box-sizing: border-box; - line-height: 32px; white-space: nowrap; text-overflow: ellipsis; color: #333; } -#app-navigation li:hover > a { - background-color: #ddd; -} #app-navigation .collapse { display: none; /* hide collapse button intially */ } #app-navigation .collapsible > .collapse { position: absolute; - left: 6px; - top: 5px; - height: 16px; - width: 16px; + height: 44px; + width: 44px; + margin: 0; + padding: 0; background: none; background-image: url('../img/actions/triangle-s.svg'); - background-size: 16px 16px; background-repeat: no-repeat; + background-size: 16px 16px; background-repeat: no-repeat; background-position: center; border: none; border-radius: 0; outline: none !important; From a5c84768f163cad6afff6ddd6c4bd30ad53a3a86 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 20:59:19 +0200 Subject: [PATCH 4/7] more whitespace WIP 2 --- core/css/styles.css | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 1eb55aea78..6499f454f9 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -482,6 +482,9 @@ div.crumb:active { height: 100%; width: 100%; } +#app * { + -moz-box-sizing: border-box; box-sizing: border-box; +} /* Navigation: folder like structure */ #app-navigation { @@ -526,7 +529,7 @@ div.crumb:active { display: block; width: 100%; height: 44px; - padding-top: 12px; + padding: 12px; overflow: hidden; -moz-box-sizing: border-box; box-sizing: border-box; white-space: nowrap; @@ -544,7 +547,7 @@ div.crumb:active { margin: 0; padding: 0; background: none; background-image: url('../img/actions/triangle-s.svg'); - background-size: 16px 16px; background-repeat: no-repeat; background-position: center; + background-size: 16px; background-repeat: no-repeat; background-position: center; border: none; border-radius: 0; outline: none !important; @@ -600,6 +603,23 @@ div.crumb:active { display: block; } + +/* counter and actions */ +#app-navigation .utils { + position: absolute; + right: 0; + top: 0; + bottom: 0; + font-size: 12px; +} + #app-navigation .utils button, + #app-navigation .utils .counter { + width: 44px; + height: 44px; + padding-top: 12px; + } + + /* drag and drop */ #app-navigation .drag-and-drop { -moz-transition: padding-bottom 500ms ease 0s; @@ -627,7 +647,7 @@ div.crumb:active { /* settings area */ #app-settings { position: fixed; - width: 249px; + width: 299px; bottom: 0; border-top: 1px solid #ccc; } From 583d0685900aefdfce4f02eb4cc5783efbca2339 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 21:21:29 +0200 Subject: [PATCH 5/7] more small whitespace fixes for the app list --- core/css/styles.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 6499f454f9..c33254856a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -287,9 +287,6 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac #navigation:hover { overflow-y: auto; /* show scrollbar only on hover */ } -#navigation li { - padding: 6px 0; /* some whitespace between apps */ -} #navigation a span { display: block; text-decoration: none; @@ -298,6 +295,7 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac color: #fff; text-shadow: #000 0 -1px 0; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ + padding-bottom: 10px; } /* icon opacity and hover effect */ @@ -327,9 +325,11 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac width: 32px; height: 32px; margin-left: 24px; - padding: 8px 0 4px; + padding: 10px 0 4px; + } + #navigation li:first-child .icon { /* special rule for Files icon as it's first */ + padding-top: 20px; } - #navigation li:first-child a { padding-top:16px; } /* USER MENU */ From bbad1ad21ef703ccc8b230dfd79b83f76ab16d41 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 21:57:47 +0200 Subject: [PATCH 6/7] more whitespace for user menu --- core/css/styles.css | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index c33254856a..97ab62df0a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -343,13 +343,28 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac background:#383c43 url('../img/noise.png') repeat; border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left: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); + -moz-box-sizing: border-box; box-sizing: border-box; } #expanddiv a { - display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; + display: block; + height: 40px; + color: #fff; + text-shadow: 0 -1px 0 #000; + padding: 4px 12px 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + filter: alpha(opacity=70); + opacity: .7; + -moz-box-sizing: border-box; box-sizing: border-box; + } + #expanddiv a img { + margin-bottom: -3px; + margin-right: 6px; + } + #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; } - #expanddiv a img { margin-bottom:-3px; } - #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } /* VARIOUS REUSABLE SELECTORS */ From b44cab5acc1adccf36ebd18ab7f4da9caf4c7932 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 9 Jul 2013 22:02:39 +0200 Subject: [PATCH 7/7] prevent ugly selection effect on accidental selection, fix #3713 --- core/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 97ab62df0a..89c074aabb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -283,6 +283,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac background:#383c43 url('../img/noise.png') repeat; -moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000; overflow:hidden; box-sizing:border-box; -moz-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 */ @@ -344,6 +346,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left: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); -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; } #expanddiv a { display: block;