diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile index 81dfa66f8..888097a9b 100644 --- a/misc/theme-cicada/Makefile +++ b/misc/theme-cicada/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= theme-cicada -PLUGIN_VERSION= 1.16 +PLUGIN_VERSION= 1.17 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 2ccf2d9b0..8bc100271 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 @@ -5775,30 +5775,47 @@ a:focus { .nav-tabs { margin-right: 1px; - > li { - float: left; - margin-bottom: -1px; - > a { - margin-right: 2px; - line-height: 1.428571429; - border-radius: 3px 3px 0 0; - cursor: pointer; - &:hover { - border-color: #4e4e4e #4e4e4e #4e4e4e; + > { + li { + float: left; + margin-bottom: -1px; + > a { + margin-right: 2px; + line-height: 1.428571429; + border-radius: 3px 3px 0 0; + cursor: pointer; + -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); } } - &.active > a { - color: #ec6d12; - background-color: #2a2a2a; - border: 1px solid #6b6a6a; - border-bottom-color: transparent; - cursor: pointer; - &:hover, &:focus { + .dropdown > a { + -webkit-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + &.pull-right { + -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + } + } + li { + > a:hover { + border-color: #4e4e4e #4e4e4e #4e4e4e; + } + &.active > a { color: #ec6d12; background-color: #2a2a2a; border: 1px solid #6b6a6a; border-bottom-color: transparent; cursor: pointer; + &:hover, &:focus { + color: #ec6d12; + background-color: #2a2a2a; + border: 1px solid #6b6a6a; + border-bottom-color: transparent; + cursor: pointer; + } } } } @@ -6948,8 +6965,8 @@ a.thumbnail { } .alert-success { - background-color: #424242; - border-color: #515151; + background-color: #424242; + border-color: #515151; color: #ffffff; hr { border-top-color: #8dcc62; @@ -9498,23 +9515,11 @@ select { min-width: 3.5em; } -#grid-log { - border: 1px solid #515151; -} - #grid-top { -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); } -.table-condensed.table-hover { - border: 1px solid #515151; -} - -#rules.table-condensed.table-hover { - border: none; -} - @media screen and (max-width: 767px) { .table-responsive { margin-bottom: 0; @@ -9681,6 +9686,14 @@ h3 { } } +#grid-log, .table-condensed.table-hover { + border: 1px solid #515151; +} + +#rules.table-condensed.table-hover { + border: none; +} + .bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon, .input-group-addon { top: 0; background-color: #ec6d12; 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 4c319f338..e2d523f2b 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 @@ -3602,31 +3602,46 @@ tbody.collapse.in { .nav-tabs { margin-right: 1px; } - .nav-tabs > li { - float: left; - margin-bottom: -1px; } - .nav-tabs > li > a { - margin-right: 2px; - line-height: 1.428571429; - border-radius: 3px 3px 0 0; - cursor:pointer;} - .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-tabs > li { + float: left; + margin-bottom: -1px; } +.nav-tabs > li > a { + margin-right: 2px; + line-height: 1.428571429; + border-radius: 3px 3px 0 0; + cursor:pointer; + -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); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); } - .nav-pills > li { +.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 { border-radius: 0; } .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 { @@ -4375,9 +4390,9 @@ a.thumbnail.active { .alert-info { background-color: #424242; border-color: #515151; - color: #ffffff; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } + color: #ffffff; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .alert-info hr { border-top-color: #B13116; } .alert-info .alert-link { @@ -4841,7 +4856,7 @@ a.list-group-item-danger { .panel-group .panel-footer + .panel-collapse .panel-body { border-bottom: 1px solid #ddd; } .panel-default { - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .panel-default > .panel-heading { color: #fff; @@ -4854,8 +4869,8 @@ a.list-group-item-danger { .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #515151; } .panel-primary { - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .panel-primary > .panel-heading { color: #fff; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { @@ -5721,16 +5736,16 @@ body { .page-content > .row { height: 100%; } .page-content-head .container-fluid { - background-color: #393939; - margin-left: 20px; - margin-right: 20px; - border: 1px solid #515151; - border-radius: 3px; - min-height: 38px; + background-color: #393939; + margin-left: 20px; + margin-right: 20px; + border: 1px solid #515151; + border-radius: 3px; + min-height: 38px; height: auto; - padding: 10px 20px 10px 20px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } + padding: 10px 20px 10px 20px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .page-content-head, .content-box-head { padding-bottom: 15px; padding-top: 20px; } @@ -6254,8 +6269,8 @@ select { #filter-log-entries th[data-column-id="__timestamp__"] { min-width: 3.5em; } #grid-top { - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } @media screen and (max-width: 767px) { .table-responsive { diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile index 3cddd4104..8d9152df9 100644 --- a/misc/theme-tukan/Makefile +++ b/misc/theme-tukan/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= theme-tukan -PLUGIN_VERSION= 1.16 +PLUGIN_VERSION= 1.17 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 ac17a2eb9..561caf988 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 @@ -8,6 +8,7 @@ padding-right: 1px !important; padding-left: 5px !important; min-height: 25px !important; + border: 1px solid #fff; .btn-group .btn { color: #FFFFFF !important; background: none; @@ -6911,10 +6912,8 @@ a.thumbnail { .alert { padding: 15px; margin-bottom: 20px; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; border-radius: 3px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); h4 { margin-top: 0; color: inherit; @@ -6944,9 +6943,9 @@ a.thumbnail { } .alert-success { - background-color: #fbfbfb; - border-color: #a5a5a5; - color: #000; + background-color: #fbfbfb; + border-color: #a5a5a5; + color: #000; hr { border-top-color: #8dcc62; } @@ -6981,7 +6980,7 @@ a.thumbnail { .alert-danger { background-color: #30596f; - border-color: #c2c2c2; + border-color: #b0b0b0; hr { border-top-color: #DA4829; } @@ -7378,7 +7377,7 @@ a.list-group-item-danger { } .panel { - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; margin-bottom: 20px; } @@ -7398,7 +7397,7 @@ a.list-group-item-danger { .panel-heading { padding: 10px 15px; - border-bottom: 1px solid #c2c2c2; + border-bottom: 1px solid #b0b0b0; border-top-right-radius: 2px; border-top-left-radius: 2px; background-color: #30596f; @@ -7715,9 +7714,9 @@ a.list-group-item-danger { > { .panel-heading { color: #fff; - border-color: #c2c2c2; + border-color: #b0b0b0; + .panel-collapse > .panel-body { - border-top-color: #c2c2c2; + border-top-color: #b0b0b0; } .badge { color: #f5f5f5; @@ -7725,7 +7724,7 @@ a.list-group-item-danger { } } .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #c2c2c2; + border-bottom-color: #b0b0b0; } } } @@ -7736,7 +7735,7 @@ a.list-group-item-danger { > { .panel-heading { color: #FFF; - border-color: #c2c2c2; + border-color: #b0b0b0; + .panel-collapse > .panel-body { border-top-color: #FF8B00; } @@ -8804,7 +8803,7 @@ body { background-color: #F0F0F0; margin-left: 20px; margin-right: 20px; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; border-radius: 3px; min-height: 38px; height: auto; @@ -8872,7 +8871,7 @@ body { padding: 0px 0px; margin: 0px 0px; background: none; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); hr { @@ -9227,33 +9226,52 @@ button.toggle-sidebar { } .nav-tabs { - > li { - border-radius: 0px; - border-top-right-radius: 10px; - margin-right: 2px; - > a { + > { + li { border-radius: 0px; border-top-right-radius: 10px; - margin-right: 0px; - outline: 0; - &:hover, &:focus { + margin-right: 2px; + > a { + border-radius: 0px; + border-top-right-radius: 10px; + margin-right: 0px; + -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + } + } + .dropdown > a { + -webkit-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.6); + &.pull-right { + -webkit-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.6); + } + } + li { + > a { + outline: 0; + &:hover, &:focus { + outline: 0; + } + } + &.active > a { + background: #315a71 !important; outline: 0; } - } - &.active > a { - background: #315a71 !important; - outline: 0; - } - > a.visible-lg-inline-block { - &:not(.pull-right) { - border-top-right-radius: 0px !important; - padding-left: 10px !important; - padding-right: 5px !important; - } - &.pull-right { - border-left: 0px !important; - padding-left: 5px !important; - padding-right: 10px !important; + > a.visible-lg-inline-block { + &:not(.pull-right) { + border-top-right-radius: 0px !important; + padding-left: 10px !important; + padding-right: 5px !important; + } + &.pull-right { + border-left: 0px !important; + padding-left: 5px !important; + padding-right: 10px !important; + } } } } @@ -9513,23 +9531,11 @@ option { min-width: 3.5em; } -#grid-log { - border: 1px solid #c2c2c2; -} - #grid-top { -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3); } -.table-condensed.table-hover { - border: 1px solid #bdbdbd; -} - -#rules.table-condensed.table-hover { - border: none; -} - @media screen and (max-width: 767px) { .table-responsive { margin-bottom: 0; @@ -9624,7 +9630,7 @@ label > input { /*additional extensions for theme-tukan*/ #tab_1 #maintabs { - border-bottom: 1px solid #c2c2c2; + border-bottom: 1px solid #b0b0b0; } textarea#update_status { @@ -9703,6 +9709,18 @@ h3 { } } +#grid-log { + border: 1px solid #b0b0b0; +} + +.table-condensed.table-hover { + border: 1px solid #bdbdbd; +} + +#rules.table-condensed.table-hover { + border: none; +} + .btn-group.bootstrap-select { &.open, &:hover { border-color: #323232 !important; @@ -9747,5 +9765,5 @@ h3 { #chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out { background-color: #FFF; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; } 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 2bb6b2b7e..a204b21a9 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,8 @@ 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 { color: #FFFFFF !important; @@ -4326,10 +4327,8 @@ a.thumbnail.active { .alert { padding: 15px; margin-bottom: 20px; - border: 1px solid #c2c2c2; - border-radius: 3px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);} + border: 1px solid #b0b0b0; + border-radius: 3px; } .alert h4 { margin-top: 0; color: inherit; } @@ -4380,7 +4379,7 @@ a.thumbnail.active { .alert-danger { background-color: #30596f; - border-color: #c2c2c2; } + border-color: #b0b0b0; } .alert-danger hr { border-top-color: #DA4829; } .alert-danger .alert-link { @@ -4652,7 +4651,7 @@ a.list-group-item-danger { line-height: 1.3; } .panel { - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; margin-bottom: 20px; } .panel-body { @@ -4666,7 +4665,7 @@ a.list-group-item-danger { .panel-heading { padding: 10px 15px; - border-bottom: 1px solid #c2c2c2; + border-bottom: 1px solid #b0b0b0; border-top-right-radius: 2px; border-top-left-radius: 2px; background-color: #30596f; } @@ -4830,20 +4829,20 @@ a.list-group-item-danger { box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .panel-default > .panel-heading { color: #fff; - border-color: #c2c2c2; } + border-color: #b0b0b0; } .panel-default > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #c2c2c2; } + border-top-color: #b0b0b0; } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #2d2d2d; } .panel-default > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #c2c2c2; } + border-bottom-color: #b0b0b0; } .panel-primary { -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .panel-primary > .panel-heading { color: #FFF; - border-color: #c2c2c2; } + border-color: #b0b0b0; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #FF8B00; } .panel-primary > .panel-heading .badge { @@ -5714,7 +5713,7 @@ body { background-color: #F0F0F0; margin-left: 20px; margin-right: 20px; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; border-radius: 3px; min-height: 38px; height:auto; @@ -5769,7 +5768,7 @@ body { padding: 0px 0px; margin: 0px 0px; background: none; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); } .content-box hr { @@ -6039,7 +6038,21 @@ button.toggle-sidebar { .nav-tabs > li > a { border-radius: 0px; border-top-right-radius: 10px; - margin-right: 0px; } + margin-right: 0px; + -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); + box-shadow: 2px 0px 2px 0px rgba(0, 0, 0, 0.60); } + .nav-tabs > li > a, .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { @@ -6325,7 +6338,7 @@ label > input[type="radio"] { /*additional extensions for theme-tukan*/ #tab_1 #maintabs { - border-bottom: 1px solid #c2c2c2; + border-bottom: 1px solid #b0b0b0; } textarea#update_status, textarea#update_status:hover { @@ -6388,7 +6401,7 @@ h3:hover, h3:focus { } #grid-log { - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; } .table-condensed.table-hover { @@ -6414,5 +6427,5 @@ h3:hover, h3:focus { #chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out { background-color: #FFF; - border: 1px solid #c2c2c2; + border: 1px solid #b0b0b0; }