From 01a91f345c0cc739d31e9713aa08b338f70868b4 Mon Sep 17 00:00:00 2001 From: marjohn56 Date: Sat, 8 Sep 2018 15:18:00 +0100 Subject: [PATCH] =?UTF-8?q?Added=20Widget=20colours=20etc=20Bump=20revisio?= =?UTF-8?q?n=20Update=20to=20match=20Ren=C3=A9=20updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- misc/theme-rebellion/Makefile | 2 +- .../rebellion/assets/stylesheets/main.scss | 97 ++++++++++--------- .../www/themes/rebellion/build/css/main.css | 79 +++++++-------- 3 files changed, 93 insertions(+), 85 deletions(-) diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile index 9b1e38e6b..6ff6a7b85 100644 --- a/misc/theme-rebellion/Makefile +++ b/misc/theme-rebellion/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= theme-rebellion -PLUGIN_VERSION= 1.5 +PLUGIN_VERSION= 1.6 PLUGIN_COMMENT= A suitably dark theme PLUGIN_MAINTAINER= team-rebellion@queens-park.com diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss index 5e19fd3f1..7491f0cee 100644 --- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss +++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss @@ -385,7 +385,7 @@ main.page-content.col-lg-12 { } > nav > #mainmenu > div > { a.list-group-item { - font-size: 11px; + font-size: 12px; text-align: center; > span { &.fa, &.glyphicon { @@ -393,22 +393,22 @@ main.page-content.col-lg-12 { font-size: 28px; } &.__iconspacer { - padding-left: 7px; - padding-right: 7px; + width: 50px; + height: 30px; + padding: 0px; } } width: 70px; height: 70px; - padding-left: 10px; - padding-right: 10px; - padding-top: 15px; - padding-bottom: 15px; + padding-left: 0px; + padding-right: 0px; + padding-top: 12px; border-bottom: 2px solid #393939; } div { &.collapsing > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; display: block !important; position: absolute !important; left: 70px !important; @@ -416,7 +416,7 @@ main.page-content.col-lg-12 { } &.collapse.in > div.collapsing > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; display: block !important; position: absolute !important; left: 148px !important; @@ -450,7 +450,7 @@ a.list-group-item.active-menu-title.collapsed { } > div.collapse.in > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; background-color: #393939 !important; &.menu-level-3-item.active { color: #ec6d12 !important; @@ -460,17 +460,17 @@ a.list-group-item.active-menu-title.collapsed { } > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; background-color: #393939 !important; } > div.collapse > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; } } &.collapsed > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; } &.collapse.in > a.list-group-item:hover { color: #ec6d12 !important; @@ -503,7 +503,7 @@ a.list-group-item:focus { } &.collapse.in { width: 150px; - font-size: 11px; + font-size: 12px; display: block; z-index: 10; position: absolute; @@ -514,27 +514,27 @@ a.list-group-item:focus { -webkit-transition: width 0.1s; -o-transition: width 0.1s; transition: width 0.1s; - -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); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); } &.collapsing { width: 0px; - font-size: 11px; + font-size: 12px; position: absolute; display: block; z-index: 10; left: 70px; margin-top: -70px; height: auto; - -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); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); } &.collapse.in > div { &.collapse.in { width: 150px; - font-size: 11px; + font-size: 12px; display: block; z-index: 10; position: absolute; @@ -545,22 +545,22 @@ a.list-group-item:focus { -webkit-transition: width 0.1s; -o-transition: width 0.1s; transition: width 0.1s; - -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); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); } &.collapsing { width: 0px; - font-size: 11px; + font-size: 12px; position: absolute; display: block; z-index: 10; left: 148px; margin-top: -28px; height: auto; - -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75); - -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.75); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.75); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.75); } } } @@ -571,22 +571,6 @@ a.list-group-item:focus { button.toggle-sidebar { &.glyphicon { - &.glyphicon-chevron-left, &.glyphicon-chevron-right { - position: absolute; - -webkit-transition: all 0.1s ease; - -moz-transition: all 0.1s ease; - -o-transition: all 0.1s ease; - -ms-transition: all 0.1s ease; - transition: all 0.1s ease; - } - &.glyphicon-chevron-left:active, &.glyphicon-chevron-right:active { - position: absolute; - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -o-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); - } &.glyphicon-chevron-left:focus, &.glyphicon-chevron-right:focus { outline: none; } @@ -953,6 +937,29 @@ div[data-for*="help_for"] { [data-state="red"] { background-color: #ec6d12; } +.tokens-container { + margin-top: 0px; + margin-bottom: 0px; +} + +.dashboard_grid_column table { + table-layout: fixed; +} + +#ipsec { + #ipsec-mobile, #ipsec-tunnel, #ipsec-overview { + background-color: #333333; + } + .ipsec-tab { + background-color: #555555; + color: white; + } + .ipsec-tab.activetab { + background-color: #888888; + color: #eeeeee; + } +} + #tab_1 #maintabs { border-bottom: 1px solid #565656; } diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css index 156d16354..d72fa2135 100644 --- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css +++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css @@ -7117,27 +7117,27 @@ main.page-content.col-lg-12 { height: 100% !important; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item { - font-size: 11px; + font-size: 12px; text-align: center; width: 70px; height: 70px; - padding-left: 10px; - padding-right: 10px; - padding-top: 15px; - padding-bottom: 15px; - border-bottom: 2px solid #393939; + padding-left: 0px; + padding-right: 0px; + padding-top:12px; + border-bottom: 2px solid #lightergrey; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.fa, #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.glyphicon { visibility: visible; font-size: 28px; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > a.list-group-item > span.__iconspacer { - padding-left: 7px; - padding-right: 7px; + width: 50px; + height: 30px; + padding: 0px; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; display: block !important; position: absolute !important; left: 70px !important; @@ -7145,7 +7145,7 @@ main.page-content.col-lg-12 { } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; display: block !important; position: absolute !important; left: 148px !important; @@ -7171,7 +7171,7 @@ a.list-group-item.active-menu-title.collapsed { } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; background-color: #393939 !important; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item.menu-level-3-item.active { @@ -7180,16 +7180,16 @@ a.list-group-item.active-menu-title.collapsed { } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; background-color: #393939 !important; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12x !important; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsed > a.list-group-item { padding-left: 10px !important; - font-size: 11px !important; + font-size: 12px !important; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover { color: #ec6d12 !important; @@ -7225,16 +7225,17 @@ a.list-group-item:focus { margin-top: -70px; height: auto; border: 1px solid #515151; + padding-bottom: 1px -webkit-transition: width 0.1s; -o-transition: width 0.1s; transition: width 0.1s; - -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); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapsing { width: 0px; - font-size: 11px; + font-size: 12px; position: absolute; display: block; z-index: 10; @@ -7247,7 +7248,7 @@ a.list-group-item:focus { } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in { width: 150px; - font-size: 11px; + font-size: 12px; display: block; z-index: 10; position: absolute; @@ -7258,13 +7259,13 @@ a.list-group-item:focus { -webkit-transition: width 0.1s; -o-transition: width 0.1s; transition: width 0.1s; - -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); - box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 2px 2px 1px 0px rgba(0, 0, 0, 0.5); } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapsing { width: 0px; - font-size: 11px; + font-size: 12px; position: absolute; display: block; z-index: 10; @@ -7286,22 +7287,7 @@ button.toggle-sidebar { margin-top: 18px; float: left; } -button.toggle-sidebar.glyphicon.glyphicon-chevron-left, button.toggle-sidebar.glyphicon.glyphicon-chevron-right { - position: absolute; - -webkit-transition: all 0.1s ease; - -moz-transition: all 0.1s ease; - -o-transition: all 0.1s ease; - -ms-transition: all 0.1s ease; - transition: all 0.1s ease; -} -button.toggle-sidebar.glyphicon.glyphicon-chevron-left:active, button.toggle-sidebar.glyphicon.glyphicon-chevron-right:active { - position: absolute; - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -o-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); -} + button.toggle-sidebar.glyphicon.glyphicon-chevron-left:focus, button.toggle-sidebar.glyphicon.glyphicon-chevron-right:focus { outline: none; } @@ -7653,6 +7639,21 @@ div[data-for*=help_for] { background-color: #ec6d12; } +.tokens-container { + margin-top: 0px; + margin-bottom: 0px; } + +.dashboard_grid_column table { + table-layout: fixed; } + +#ipsec #ipsec-mobile, #ipsec #ipsec-tunnel, #ipsec #ipsec-overview { + background-color: #333333; } +#ipsec .ipsec-tab { + background-color: #555555; + color: black; } +#ipsec .ipsec-tab.activetab { + background-color: #888888; + color: #eeeeee; } #tab_1 #maintabs { border-bottom: 1px solid #565656; }