From fdd71bfb5de3563caf2d189359ad20b0368ccb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9?= <34602360+opnsenseuser@users.noreply.github.com> Date: Thu, 30 May 2019 12:35:17 +0200 Subject: [PATCH] Themes - Tukan/Cicada dropdown-menu shadow and other fixes (#1349) --- misc/theme-cicada/Makefile | 2 +- .../cicada/assets/stylesheets/main.scss | 10 +++++--- .../www/themes/cicada/build/css/main.css | 23 +++++++++++-------- misc/theme-tukan/Makefile | 2 +- .../themes/tukan/assets/stylesheets/main.scss | 10 +++++--- .../www/themes/tukan/build/css/main.css | 19 +++++++++------ 6 files changed, 42 insertions(+), 24 deletions(-) diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile index 888097a9b..e5b6de035 100644 --- a/misc/theme-cicada/Makefile +++ b/misc/theme-cicada/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= theme-cicada -PLUGIN_VERSION= 1.17 +PLUGIN_VERSION= 1.18 PLUGIN_COMMENT= The cicada theme - grey/orange PLUGIN_MAINTAINER= rene@team-rebellion.net 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 8bc100271..7da06b1d9 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 @@ -5124,6 +5124,10 @@ tbody.collapse.in { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; + -webkit-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + opacity: 0.97; &.pull-right { right: 0; left: auto; @@ -8852,7 +8856,7 @@ body { .page-content-main { min-height: calc(100% - 64px); - padding: 15px 0 73px; + padding: 15px 0 21px; } .page-side { @@ -9117,7 +9121,7 @@ a.list-group-item.active-menu-title.collapsed { padding-left: 10px !important; font-size: 14px !important; background-color: #393939 !important; - opacity: 0.9; + opacity: 0.95; &.menu-level-3-item.active { color: #ec6d12 !important; background-color: #2a2a2a !important; @@ -9128,7 +9132,7 @@ a.list-group-item.active-menu-title.collapsed { padding-left: 10px !important; font-size: 14px !important; background-color: #393939 !important; - opacity: 0.9; + opacity: 0.95; } > div.collapse > a.list-group-item { padding-left: 10px !important; 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 84bb9438f..9bb4d2e22 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 @@ -3180,7 +3180,12 @@ tbody.collapse.in { border-radius: 3px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - background-clip: padding-box; } + background-clip: padding-box; + -webkit-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + -moz-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + opacity: 0.97; } + .dropdown-menu.pull-right { right: 0; left: auto; @@ -3613,12 +3618,12 @@ tbody.collapse.in { -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); } - + .nav-tabs > .dropdown > a { -webkit-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); -moz-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); } - + .nav-tabs > .dropdown > a.pull-right { -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); @@ -3626,14 +3631,14 @@ tbody.collapse.in { .nav-tabs > li > a:hover { border-color: #4e4e4e #4e4e4e #4e4e4e; } - + .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #ec6d12; background-color: #2a2a2a; border: 1px solid #6b6a6a; border-bottom-color: transparent; cursor: pointer; } - + .nav-pills > li { float: left; } .nav-pills > li > a { @@ -3641,7 +3646,7 @@ tbody.collapse.in { .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #ec6d12; } - + .nav-stacked > li { float: none; } .nav-stacked > li + li { @@ -4381,7 +4386,7 @@ a.thumbnail.active { background-color: #424242; border-color: #515151; color: #ffffff; } - + .alert-success hr { border-top-color: #8dcc62; } .alert-success .alert-link { @@ -5757,7 +5762,7 @@ body { .page-content-main { min-height: calc(100% - 64px); - padding: 15px 0 73px; } + padding: 15px 0 21px; } .page-side { background: #202020; @@ -5969,7 +5974,7 @@ main.page-content.col-lg-12 { padding-left: 10px !important; font-size: 14px !important; background-color: #393939 !important; - opacity: 0.9; + opacity: 0.95; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > div.collapse.in > a.list-group-item.menu-level-3-item.active { diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile index 8d9152df9..22113a18a 100644 --- a/misc/theme-tukan/Makefile +++ b/misc/theme-tukan/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= theme-tukan -PLUGIN_VERSION= 1.17 +PLUGIN_VERSION= 1.18 PLUGIN_COMMENT= The tukan theme - blue/white PLUGIN_MAINTAINER= rene@team-rebellion.net 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 561caf988..af8435206 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 @@ -5123,6 +5123,10 @@ tbody.collapse.in { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; + -webkit-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.6); + opacity: 0.97; &.pull-right { right: 0; left: auto; @@ -8833,7 +8837,7 @@ body { .page-content-main { min-height: calc(100% - 64px); - padding: 15px 0 73px; + padding: 15px 0 21px; } .page-side { @@ -9106,14 +9110,14 @@ a.list-group-item.active-menu-title.collapsed { padding-left: 10px !important; font-size: 14px !important; background-color: #294c5f !important; - opacity: 0.9; + opacity: 0.95; } } > a.list-group-item { padding-left: 10px !important; font-size: 14px !important; background-color: #294c5f !important; - opacity: 0.9; + opacity: 0.95; } > div.collapse > a.list-group-item { padding-left: 10px !important; 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 0c0a44db4..fe8a23a22 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 @@ -6,7 +6,7 @@ padding-top: 1px !important; padding-right: 1px !important; padding-left: 5px !important; - min-height: 25px !important; + min-height: 25px !important; border: 1px solid #fff; } .widgetdiv .content-box-head .btn-group .btn { @@ -3169,12 +3169,17 @@ tbody.collapse.in { border-radius: 3px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - background-clip: padding-box; } + background-clip: padding-box; + -webkit-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + -moz-box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + box-shadow: 3px 8px 10px 0px rgba(0, 0, 0, 0.60); + opacity: 0.97; } + .dropdown-menu.pull-right { right: 0; left: auto; - background-color: #e5e5e5;} - + background-color: #e5e5e5; } + .dropdown-menu .divider { height: 1px; margin: 9px 0; @@ -5733,7 +5738,7 @@ body { .page-content-main { min-height: calc(100% - 64px); - padding: 15px 0 73px; } + padding: 15px 0 21px; } .page-side { background: #172c38; @@ -5945,7 +5950,7 @@ main.page-content.col-lg-12 { padding-left: 10px !important; font-size: 14px !important; background-color: #294c5f !important; - opacity: 0.9; + opacity: 0.95; } #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse > div.collapse > a.list-group-item, @@ -6047,7 +6052,7 @@ button.toggle-sidebar { -webkit-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); -moz-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.60); } - + .nav-tabs > .dropdown > a.pull-right { -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60);