From 3cfd298fa4c12e16f12c4192796c8e8a065aae31 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 10 Oct 2018 09:02:50 +0200 Subject: [PATCH] =?UTF-8?q?misc/theme-*:=20more=20changes=20via=20Ren?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cicada/assets/stylesheets/main.scss | 12 +-------- .../www/themes/cicada/build/css/main.css | 13 +++------ .../themes/tukan/assets/stylesheets/main.scss | 27 +++++++------------ .../www/themes/tukan/build/css/main.css | 24 +++++++---------- 4 files changed, 22 insertions(+), 54 deletions(-) diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss index 641807b71..bb440e70f 100644 --- a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss +++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss @@ -9120,13 +9120,11 @@ a.list-group-item:focus { &.collapse.in { width: 168px; font-size: 14px; - display: block; z-index: 10; position: absolute; left: 70px; margin-top: -70px; padding-bottom: 1px; - height: auto; border: 1px solid #515151; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); @@ -9151,22 +9149,14 @@ a.list-group-item:focus { } } -/* Sub Level One */ - -/* Sub Level Two */ - button.toggle-sidebar { - &.glyphicon { - &.glyphicon-chevron-left:focus, &.glyphicon-chevron-right:focus { - outline: none; - } - } color: #FFF; background-color: transparent; font-size: 14px; border: none; margin-top: 18px; float: left; + outline:none; } /* COLLAPSE SIDEBAR END*/ diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css index 3a0f19488..dd9daf1dd 100644 --- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css +++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css @@ -5960,7 +5960,7 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus, #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus, #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus, -#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active { +#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active { color: #ec6d12 !important; background-color: #2a2a2a !important; } @@ -5969,13 +5969,11 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in { width:168px; font-size:14px; - display: block; z-index: 10; position: absolute; left: 70px; margin-top:-70px; padding-bottom: 1px; - height:auto; border:1px solid #515151; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); @@ -5986,12 +5984,10 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in { width:168px; font-size:14px; - display: block; z-index: 10; position: absolute; left: 166px; margin-top:-32px; - height:auto; border:1px solid #515151; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); @@ -6003,11 +5999,6 @@ main.page-content.col-lg-12 { display:none; } -button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus, -button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus { - outline:none; -} - button.toggle-sidebar { color:#FFF; background-color:transparent; @@ -6015,7 +6006,9 @@ button.toggle-sidebar { border:none; margin-top: 18px; float:left; + outline:none; } + /* COLLAPSE SIDEBAR END*/ #navigation.collapse.in { diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss index 23d73fc9d..e525507be 100644 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss +++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss @@ -5202,7 +5202,7 @@ tbody.collapse.in { padding: 3px 20px; font-size: 12px; line-height: 1.428571429; - color: #777777; + color: #b0b0b0; white-space: nowrap; } @@ -5743,13 +5743,14 @@ a:focus { .nav { > li.disabled > a { - color: #777777; + color: #fff; &:hover, &:focus { - color: #777777; - text-decoration: none; - background-color: transparent; - cursor: not-allowed; - } + color: #fff; + text-decoration: none; + background-color: #839caa; + opacity:0.9; + cursor: not-allowed; + } } .open > a { background-color: #336480; @@ -9162,12 +9163,10 @@ a.list-group-item:focus { &.collapse.in { width: 168px; font-size: 14px; - display: block; z-index: 10; position: absolute; left: 70px; margin-top: -70px; - height: auto; border: 1px solid #1f3a4a; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); @@ -9192,22 +9191,14 @@ a.list-group-item:focus { } } -/* Sub Level One */ - -/* Sub Level Two */ - button.toggle-sidebar { - &.glyphicon { - &.glyphicon-chevron-left:focus, &.glyphicon-chevron-right:focus { - outline: none; - } - } color: #FFF; background-color: transparent; font-size: 14px; border: none; margin-top: 18px; float: left; + outline: none; } /* COLLAPSE SIDEBAR END*/ diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css index 2e5ae6a02..5677c811e 100644 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css +++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css @@ -3229,7 +3229,7 @@ tbody.collapse.in { padding: 3px 20px; font-size: 12px; line-height: 1.428571429; - color: #777777; + color: #b0b0b0; white-space: nowrap; } .dropdown-backdrop { @@ -3569,12 +3569,13 @@ tbody.collapse.in { text-decoration: underline; } .nav > li.disabled > a { - color: #777777; } + color: #fff; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #777777; - text-decoration: none; - background-color: transparent; - cursor: not-allowed; } + color: #fff; + text-decoration: none; + background-color: #839caa; + opacity:0.9; + cursor: not-allowed; } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #336480; @@ -5966,12 +5967,10 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in { width:168px; font-size:14px; - display: block; z-index: 10; position: absolute; left: 70px; margin-top:-70px; - height:auto; border:1px solid #1f3a4a; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); @@ -5982,12 +5981,10 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in { width:168px; font-size:14px; - display: block; z-index: 10; position: absolute; left: 166px; margin-top:-32px; - height:auto; border:1px solid #1f3a4a; -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.50); @@ -5999,11 +5996,6 @@ main.page-content.col-lg-12 { display:none; } -button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus, -button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus { - outline:none; -} - button.toggle-sidebar { color:#FFF; background-color:transparent; @@ -6011,7 +6003,9 @@ button.toggle-sidebar { border:none; margin-top: 18px; float:left; + outline:none; } + /* COLLAPSE SIDEBAR END*/ #navigation.collapse.in {