From d0ac0b3f9d527d23896c136157d5ff646f3bf3de Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 19 Sep 2023 13:13:41 +0200 Subject: [PATCH] misc: rename bootstrap-select files and bump version PR: https://github.com/opnsense/core/issues/6849 --- misc/theme-cicada/Makefile | 1 + ...lect-1.13.3.scss => bootstrap-select.scss} | 0 ...elect-1.13.3.css => bootstrap-select1.css} | 0 misc/theme-rebellion/Makefile | 1 + ...lect-1.13.3.scss => bootstrap-select.scss} | 0 .../build/css/bootstrap-select-1.13.3.css | 405 ------------------ .../rebellion/build/css/bootstrap-select.css | 262 ++++++++--- misc/theme-tukan/Makefile | 1 + ...ect-1.13.3.scss => bootstrap-select1.scss} | 0 .../build/css/bootstrap-select-1.13.3.css | 398 ----------------- .../tukan/build/css/bootstrap-select.css | 258 +++++++---- misc/theme-vicuna/Makefile | 1 + ...ect-1.13.3.scss => bootstrap-select1.scss} | 0 .../build/css/bootstrap-select-1.13.3.css | 398 ----------------- .../vicuna/build/css/bootstrap-select.css | 258 +++++++---- 15 files changed, 569 insertions(+), 1414 deletions(-) rename misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/{bootstrap-select-1.13.3.scss => bootstrap-select.scss} (100%) rename misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/{bootstrap-select-1.13.3.css => bootstrap-select1.css} (100%) rename misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/{bootstrap-select-1.13.3.scss => bootstrap-select.scss} (100%) delete mode 100644 misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select-1.13.3.css rename misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/{bootstrap-select-1.13.3.scss => bootstrap-select1.scss} (100%) delete mode 100644 misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css rename misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/{bootstrap-select-1.13.3.scss => bootstrap-select1.scss} (100%) delete mode 100644 misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select-1.13.3.css diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile index 2d7b418c3..2783100d1 100644 --- a/misc/theme-cicada/Makefile +++ b/misc/theme-cicada/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= theme-cicada PLUGIN_VERSION= 1.34 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= The cicada theme - dark grey onyx PLUGIN_MAINTAINER= rene@team-rebellion.net PLUGIN_NO_ABI= yes diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select.scss similarity index 100% rename from misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select-1.13.3.scss rename to misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/bootstrap-select.scss diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select1.css similarity index 100% rename from misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select-1.13.3.css rename to misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/bootstrap-select1.css diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile index b15ab9ea5..e4c0763f5 100644 --- a/misc/theme-rebellion/Makefile +++ b/misc/theme-rebellion/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= theme-rebellion PLUGIN_VERSION= 1.8.8 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= A suitably dark theme PLUGIN_MAINTAINER= team-rebellion@queens-park.com PLUGIN_NO_ABI= yes diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/bootstrap-select.scss similarity index 100% rename from misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/bootstrap-select-1.13.3.scss rename to misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/bootstrap-select.scss diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select-1.13.3.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select-1.13.3.css deleted file mode 100644 index bbc5c29d9..000000000 --- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select-1.13.3.css +++ /dev/null @@ -1,405 +0,0 @@ -/*! - * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) - * - * Copyright 2012-2018 SnapAppointments, LLC - * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) - */ - -select.bs-select-hidden, -.bootstrap-select > select.bs-select-hidden, -select.selectpicker { - display: none !important; - -} -.bootstrap-select { - width: 348px \0; - /*IE9 and below*/ -} -.bootstrap-select > .dropdown-toggle { - position: relative; - width: 100%; - - z-index: 1; - text-align: right; - white-space: nowrap; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder, -.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder:active { - color: #ccc; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { - color: rgba(0, 0, 0, 0.5); -} -.bootstrap-select > select { - position: absolute !important; - bottom: 0; - left: 50%; - display: block !important; - width: 0.5px !important; - height: 100% !important; - padding: 0 !important; - opacity: 0 !important; - border: none; -} -.bootstrap-select > select.mobile-device { - top: 0; - left: 0; - display: block !important; - width: 100% !important; - z-index: 2; -} -.has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle, -.bootstrap-select.is-invalid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { - border-color: #b94a48; -} -.bootstrap-select.is-valid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { - border-color: #28a745; -} -.bootstrap-select.fit-width { - width: auto !important; -} -.bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { - width: 348px; -} -.bootstrap-select > select.mobile-device:focus + .dropdown-toggle, -.bootstrap-select .dropdown-toggle:focus { - outline: thin dotted #bbbbbb !important; - outline: 5px auto -webkit-focus-ring-color !important; - outline-offset: -2px; -} -.bootstrap-select.form-control { - margin-bottom: 0; - padding: 0; - border: none; -} -:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { - width: 100%; -} -.bootstrap-select.form-control.input-group-btn { - z-index: auto; -} -.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.bootstrap-select:not(.input-group-btn), -.bootstrap-select[class*="col-"] { - float: none; - display: inline-block; - margin-left: 0; -} -.bootstrap-select.dropdown-menu-right, -.bootstrap-select[class*="col-"].dropdown-menu-right, -.row .bootstrap-select[class*="col-"].dropdown-menu-right { - float: right; -} -.form-inline .bootstrap-select, -.form-horizontal .bootstrap-select, -.form-group .bootstrap-select { - margin-bottom: 0; -} -.form-group-lg .bootstrap-select.form-control, -.form-group-sm .bootstrap-select.form-control { - padding: 0; -} -.form-group-lg .bootstrap-select.form-control .dropdown-toggle, -.form-group-sm .bootstrap-select.form-control .dropdown-toggle { - height: 100%; - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle, -.bootstrap-select.form-control-lg .dropdown-toggle { - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle { - padding: 0.25rem 0.5rem; -} -.bootstrap-select.form-control-lg .dropdown-toggle { - padding: 0.5rem 1rem; -} -.form-inline .bootstrap-select .form-control { - width: 100%; -} -.bootstrap-select.disabled, -.bootstrap-select > .disabled { - cursor: not-allowed; -} -.bootstrap-select.disabled:focus, -.bootstrap-select > .disabled:focus { - outline: none !important; -} -.bootstrap-select.bs-container { - position: absolute; - top: 0; - left: 0; - height: 0 !important; - padding: 0 !important; -} -.bootstrap-select.bs-container .dropdown-menu { - z-index: 1060; -} -.bootstrap-select .dropdown-toggle:before { - content: ''; - display: inline-block; -} -.bootstrap-select .dropdown-toggle .filter-option { - position: absolute; - top: 0; - left: 0; - padding-top: inherit; - padding-right: inherit; - padding-bottom: inherit; - padding-left: inherit; - height: 100%; - width: 100%; - text-align: left; -} -.bootstrap-select .dropdown-toggle .filter-option-inner { - padding-right: inherit; -} -.bootstrap-select .dropdown-toggle .filter-option-inner-inner { - overflow: hidden; -} -.bootstrap-select .dropdown-toggle .caret { - position: absolute; - top: 50%; - right: 12px; - margin-top: -2px; - vertical-align: middle; -} -.input-group .bootstrap-select.form-control .dropdown-toggle { - border-radius: inherit; -} -.bootstrap-select[class*="col-"] .dropdown-toggle { - width: 100%; -} -.bootstrap-select .dropdown-menu { - min-width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .dropdown-menu > .inner:focus { - outline: none !important; -} -.bootstrap-select .dropdown-menu.inner { - position: static; - float: none; - border: 0; - padding: 0; - margin: 0; - border-radius: 0; - -webkit-box-shadow: none; - box-shadow: none; -} -.bootstrap-select .dropdown-menu li { - position: relative; -} -.bootstrap-select .dropdown-menu li.active small { - color: rgba(255, 255, 255, 0.5) !important; -} -.bootstrap-select .dropdown-menu li.disabled a { - cursor: not-allowed; -} -.bootstrap-select .dropdown-menu li a { - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.bootstrap-select .dropdown-menu li a.opt { - position: relative; - padding-left: 2.25em; -} -.bootstrap-select .dropdown-menu li a span.check-mark { - display: none; -} -.bootstrap-select .dropdown-menu li a span.text { - display: inline-block; -} -.bootstrap-select .dropdown-menu li small { - padding-left: 0.5em; -} -.bootstrap-select .dropdown-menu .notify { - position: absolute; - bottom: 5px; - width: 96%; - margin: 0 2%; - min-height: 26px; - padding: 3px 5px; - background: #151515; - border: 1px solid #232323; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - pointer-events: none; - opacity: 0.9; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .no-results { - padding: 3px; - background: #151515; - margin: 0 5px; - white-space: nowrap; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option { - position: static; - display: inline; - padding: 0; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { - display: inline; -} -.bootstrap-select.fit-width .dropdown-toggle .caret { - position: static; - top: auto; - margin-top: -1px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - position: absolute; - display: inline-block; - right: 15px; - top: 5px; -} -.bootstrap-select.show-tick .dropdown-menu li a span.text { - margin-right: 34px; -} -.bootstrap-select .bs-ok-default:after { - content: ''; - display: block; - width: 0.5em; - height: 1em; - border-style: solid; - border-width: 0 0.26em 0.26em 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { - z-index: 1061; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { - content: ''; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid rgba(204, 204, 204, 0.2); - position: absolute; - bottom: -4px; - left: 9px; - display: none; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { - content: ''; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid white; - position: absolute; - bottom: -4px; - left: 10px; - display: none; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { - bottom: auto; - top: -4px; - border-top: 7px solid rgba(50, 50, 50, 0.2); - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { - bottom: auto; - top: -4px; - border-top: 6px solid white; - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { - right: 12px; - left: auto; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { - right: 13px; - left: auto; -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { - display: block; -} -.bs-searchbox, -.bs-actionsbox, -.bs-donebutton { - padding: 4px 8px; -} -.bs-actionsbox { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-actionsbox .btn-group button { - width: 50%; -} -.bs-donebutton { - float: left; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-donebutton .btn-group button { - width: 100%; -} -.bs-searchbox + .bs-actionsbox { - padding: 0 8px 4px; -} -.bs-searchbox .form-control { - margin-bottom: 0; - width: 100%; - float: none; -} - -/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : - * Move checkmarks to left hand side of the dropdown. - */ -.bootstrap-select .dropdown-menu > li > a { - padding: 3px 20px 3px 30px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - left: 10px; -} -/* End OPNsense edit to fix #2612. */ diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select.css index 819f88d59..bbc5c29d9 100644 --- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select.css +++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/bootstrap-select.css @@ -1,29 +1,66 @@ /*! - * Bootstrap-select v1.9.3 (http://silviomoreto.github.io/bootstrap-select) + * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) * - * Copyright 2013-2015 bootstrap-select - * Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE) + * Copyright 2012-2018 SnapAppointments, LLC + * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) */ -/* set form-control on span height, which is used by liHeight to calculate height */ -span.form-control { - height: 34px !important; - padding: 6px 12px; +select.bs-select-hidden, +.bootstrap-select > select.bs-select-hidden, +select.selectpicker { + display: none !important; + } .bootstrap-select { width: 348px \0; /*IE9 and below*/ } .bootstrap-select > .dropdown-toggle { + position: relative; width: 100%; - padding-right: 25px; + z-index: 1; + text-align: right; + white-space: nowrap; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder, +.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder:active { + color: #ccc; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { + color: rgba(0, 0, 0, 0.5); } .bootstrap-select > select { position: absolute !important; bottom: 0; left: 50%; - width: 0.11px !important; + display: block !important; + width: 0.5px !important; height: 100% !important; padding: 0 !important; opacity: 0 !important; @@ -37,17 +74,24 @@ span.form-control { z-index: 2; } .has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle { +.error .bootstrap-select .dropdown-toggle, +.bootstrap-select.is-invalid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { border-color: #b94a48; } +.bootstrap-select.is-valid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { + border-color: #28a745; +} .bootstrap-select.fit-width { width: auto !important; } .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { width: 348px; } +.bootstrap-select > select.mobile-device:focus + .dropdown-toggle, .bootstrap-select .dropdown-toggle:focus { - outline: thin dotted #333333 !important; + outline: thin dotted #bbbbbb !important; outline: 5px auto -webkit-focus-ring-color !important; outline-offset: -2px; } @@ -56,72 +100,120 @@ span.form-control { padding: 0; border: none; } -.bootstrap-select.form-control:not([class*="col-"]) { +:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { width: 100%; } .bootstrap-select.form-control.input-group-btn { z-index: auto; } -.bootstrap-select.btn-group:not(.input-group-btn), -.bootstrap-select.btn-group[class*="col-"] { +.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.bootstrap-select:not(.input-group-btn), +.bootstrap-select[class*="col-"] { float: none; display: inline-block; margin-left: 0; } -.bootstrap-select.btn-group.dropdown-menu-right, -.bootstrap-select.btn-group[class*="col-"].dropdown-menu-right, -.row .bootstrap-select.btn-group[class*="col-"].dropdown-menu-right { +.bootstrap-select.dropdown-menu-right, +.bootstrap-select[class*="col-"].dropdown-menu-right, +.row .bootstrap-select[class*="col-"].dropdown-menu-right { float: right; } -.form-inline .bootstrap-select.btn-group, -.form-horizontal .bootstrap-select.btn-group, -.form-group .bootstrap-select.btn-group { +.form-inline .bootstrap-select, +.form-horizontal .bootstrap-select, +.form-group .bootstrap-select { margin-bottom: 0; } -.form-group-lg .bootstrap-select.btn-group.form-control, -.form-group-sm .bootstrap-select.btn-group.form-control { +.form-group-lg .bootstrap-select.form-control, +.form-group-sm .bootstrap-select.form-control { padding: 0; } -.form-inline .bootstrap-select.btn-group .form-control { +.form-group-lg .bootstrap-select.form-control .dropdown-toggle, +.form-group-sm .bootstrap-select.form-control .dropdown-toggle { + height: 100%; + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle, +.bootstrap-select.form-control-lg .dropdown-toggle { + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle { + padding: 0.25rem 0.5rem; +} +.bootstrap-select.form-control-lg .dropdown-toggle { + padding: 0.5rem 1rem; +} +.form-inline .bootstrap-select .form-control { width: 100%; } -.bootstrap-select.btn-group.disabled, -.bootstrap-select.btn-group > .disabled { +.bootstrap-select.disabled, +.bootstrap-select > .disabled { cursor: not-allowed; } -.bootstrap-select.btn-group.disabled:focus, -.bootstrap-select.btn-group > .disabled:focus { +.bootstrap-select.disabled:focus, +.bootstrap-select > .disabled:focus { outline: none !important; } -.bootstrap-select.btn-group.bs-container { +.bootstrap-select.bs-container { position: absolute; + top: 0; + left: 0; + height: 0 !important; + padding: 0 !important; } -.bootstrap-select.btn-group.bs-container .dropdown-menu { +.bootstrap-select.bs-container .dropdown-menu { z-index: 1060; } -.bootstrap-select.btn-group .dropdown-toggle .filter-option { +.bootstrap-select .dropdown-toggle:before { + content: ''; display: inline-block; - overflow: hidden; +} +.bootstrap-select .dropdown-toggle .filter-option { + position: absolute; + top: 0; + left: 0; + padding-top: inherit; + padding-right: inherit; + padding-bottom: inherit; + padding-left: inherit; + height: 100%; width: 100%; text-align: left; } -.bootstrap-select.btn-group .dropdown-toggle .caret { +.bootstrap-select .dropdown-toggle .filter-option-inner { + padding-right: inherit; +} +.bootstrap-select .dropdown-toggle .filter-option-inner-inner { + overflow: hidden; +} +.bootstrap-select .dropdown-toggle .caret { position: absolute; top: 50%; right: 12px; margin-top: -2px; vertical-align: middle; } -.bootstrap-select.btn-group[class*="col-"] .dropdown-toggle { +.input-group .bootstrap-select.form-control .dropdown-toggle { + border-radius: inherit; +} +.bootstrap-select[class*="col-"] .dropdown-toggle { width: 100%; } -.bootstrap-select.btn-group .dropdown-menu { +.bootstrap-select .dropdown-menu { min-width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .dropdown-menu.inner { +.bootstrap-select .dropdown-menu > .inner:focus { + outline: none !important; +} +.bootstrap-select .dropdown-menu.inner { position: static; float: none; border: 0; @@ -131,44 +223,44 @@ span.form-control { -webkit-box-shadow: none; box-shadow: none; } -.bootstrap-select.btn-group .dropdown-menu li { +.bootstrap-select .dropdown-menu li { position: relative; } -.bootstrap-select.btn-group .dropdown-menu li.active small { - color: #fff; +.bootstrap-select .dropdown-menu li.active small { + color: rgba(255, 255, 255, 0.5) !important; } -.bootstrap-select.btn-group .dropdown-menu li.disabled a { +.bootstrap-select .dropdown-menu li.disabled a { cursor: not-allowed; } -.bootstrap-select.btn-group .dropdown-menu li a { +.bootstrap-select .dropdown-menu li a { cursor: pointer; -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.bootstrap-select.btn-group .dropdown-menu li a.opt { +.bootstrap-select .dropdown-menu li a.opt { position: relative; padding-left: 2.25em; } -.bootstrap-select.btn-group .dropdown-menu li a span.check-mark { +.bootstrap-select .dropdown-menu li a span.check-mark { display: none; } -.bootstrap-select.btn-group .dropdown-menu li a span.text { +.bootstrap-select .dropdown-menu li a span.text { display: inline-block; } -.bootstrap-select.btn-group .dropdown-menu li small { +.bootstrap-select .dropdown-menu li small { padding-left: 0.5em; } -.bootstrap-select.btn-group .dropdown-menu .notify { +.bootstrap-select .dropdown-menu .notify { position: absolute; bottom: 5px; width: 96%; margin: 0 2%; min-height: 26px; padding: 3px 5px; - background: #f5f5f5; - border: 1px solid #e3e3e3; + background: #151515; + border: 1px solid #232323; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); pointer-events: none; @@ -177,33 +269,52 @@ span.form-control { -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .no-results { +.bootstrap-select .no-results { padding: 3px; - background: #f5f5f5; + background: #151515; margin: 0 5px; white-space: nowrap; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .filter-option { +.bootstrap-select.fit-width .dropdown-toggle .filter-option { position: static; + display: inline; + padding: 0; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .caret { +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { + display: inline; +} +.bootstrap-select.fit-width .dropdown-toggle .caret { position: static; top: auto; margin-top: -1px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark { +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { position: absolute; display: inline-block; right: 15px; - margin-top: 5px; + top: 5px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text { +.bootstrap-select.show-tick .dropdown-menu li a span.text { margin-right: 34px; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle { +.bootstrap-select .bs-ok-default:after { + content: ''; + display: block; + width: 0.5em; + height: 1em; + border-style: solid; + border-width: 0 0.26em 0.26em 0; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { z-index: 1061; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { content: ''; border-left: 7px solid transparent; border-right: 7px solid transparent; @@ -213,7 +324,7 @@ span.form-control { left: 9px; display: none; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { content: ''; border-left: 6px solid transparent; border-right: 6px solid transparent; @@ -223,28 +334,30 @@ span.form-control { left: 10px; display: none; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { bottom: auto; - top: -3px; - border-top: 7px solid rgba(204, 204, 204, 0.2); + top: -4px; + border-top: 7px solid rgba(50, 50, 50, 0.2); border-bottom: 0; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { bottom: auto; - top: -3px; + top: -4px; border-top: 6px solid white; border-bottom: 0; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { right: 12px; left: auto; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { right: 13px; left: auto; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { display: block; } .bs-searchbox, @@ -279,3 +392,14 @@ span.form-control { width: 100%; float: none; } + +/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : + * Move checkmarks to left hand side of the dropdown. + */ +.bootstrap-select .dropdown-menu > li > a { + padding: 3px 20px 3px 30px; +} +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { + left: 10px; +} +/* End OPNsense edit to fix #2612. */ diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile index 54f47d87c..58302aefc 100644 --- a/misc/theme-tukan/Makefile +++ b/misc/theme-tukan/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= theme-tukan PLUGIN_VERSION= 1.27 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= The tukan theme - blue/white PLUGIN_MAINTAINER= rene@team-rebellion.net PLUGIN_NO_ABI= yes diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select1.scss similarity index 100% rename from misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select-1.13.3.scss rename to misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/bootstrap-select1.scss diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css deleted file mode 100644 index 01c668321..000000000 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select-1.13.3.css +++ /dev/null @@ -1,398 +0,0 @@ -/*! - * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) - * - * Copyright 2012-2018 SnapAppointments, LLC - * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) - */ - -select.bs-select-hidden, -.bootstrap-select > select.bs-select-hidden, -select.selectpicker { - display: none !important; -} -.bootstrap-select { - width: 348px \0; - /*IE9 and below*/ -} -.bootstrap-select > .dropdown-toggle { - position: relative; - width: 100%; - z-index: 1; - text-align: right; - white-space: nowrap; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder, -.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder:active { - color: #000; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { - color: #ffffff; -} -.bootstrap-select > select { - position: absolute !important; - bottom: 0; - left: 50%; - display: block !important; - width: 0.5px !important; - height: 100% !important; - padding: 0 !important; - opacity: 0 !important; - border: none; -} -.bootstrap-select > select.mobile-device { - top: 0; - left: 0; - display: block !important; - width: 100% !important; - z-index: 2; -} -.has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle, -.bootstrap-select.is-invalid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { - border-color: #b94a48; -} -.bootstrap-select.is-valid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { - border-color: #28a745; -} -.bootstrap-select.fit-width { - width: auto !important; -} -.bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { - width: 348px; -} - -.bootstrap-select.form-control { - margin-bottom: 0; - padding: 0; - border: none; -} -:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { - width: 100%; -} -.bootstrap-select.form-control.input-group-btn { - z-index: auto; -} -.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.bootstrap-select:not(.input-group-btn), -.bootstrap-select[class*="col-"] { - float: none; - display: inline-block; - margin-left: 0; -} -.bootstrap-select.dropdown-menu-right, -.bootstrap-select[class*="col-"].dropdown-menu-right, -.row .bootstrap-select[class*="col-"].dropdown-menu-right { - float: right; -} -.form-inline .bootstrap-select, -.form-horizontal .bootstrap-select, -.form-group .bootstrap-select { - margin-bottom: 0; -} -.form-group-lg .bootstrap-select.form-control, -.form-group-sm .bootstrap-select.form-control { - padding: 0; -} -.form-group-lg .bootstrap-select.form-control .dropdown-toggle, -.form-group-sm .bootstrap-select.form-control .dropdown-toggle { - height: 100%; - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle, -.bootstrap-select.form-control-lg .dropdown-toggle { - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle { - padding: 0.25rem 0.5rem; -} -.bootstrap-select.form-control-lg .dropdown-toggle { - padding: 0.5rem 1rem; -} -.form-inline .bootstrap-select .form-control { - width: 100%; -} -.bootstrap-select.disabled, -.bootstrap-select > .disabled { - cursor: not-allowed; -} -.bootstrap-select.disabled:focus, -.bootstrap-select > .disabled:focus { - outline: none !important; -} -.bootstrap-select.bs-container { - position: absolute; - top: 0; - left: 0; - height: 0 !important; - padding: 0 !important; -} -.bootstrap-select.bs-container .dropdown-menu { - z-index: 1060; -} -.bootstrap-select .dropdown-toggle:before { - content: ''; - display: inline-block; -} -.bootstrap-select .dropdown-toggle .filter-option { - position: absolute; - top: 0; - left: 0; - padding-top: inherit; - padding-right: inherit; - padding-bottom: inherit; - padding-left: inherit; - height: 100%; - width: 100%; - text-align: left; -} -.bootstrap-select .dropdown-toggle .filter-option-inner { - padding-right: inherit; -} -.bootstrap-select .dropdown-toggle .filter-option-inner-inner { - overflow: hidden; -} -.bootstrap-select .dropdown-toggle .caret { - position: absolute; - top: 50%; - right: 12px; - margin-top: -2px; - vertical-align: middle; -} -.input-group .bootstrap-select.form-control .dropdown-toggle { - border-radius: inherit; -} -.bootstrap-select[class*="col-"] .dropdown-toggle { - width: 100%; -} -.bootstrap-select .dropdown-menu { - min-width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .dropdown-menu > .inner:focus { - outline: none !important; -} -.bootstrap-select .dropdown-menu.inner { - position: static; - float: none; - border: 0; - padding: 0; - margin: 0; - border-radius: 0; - -webkit-box-shadow: none; - box-shadow: none; -} -.bootstrap-select .dropdown-menu li { - position: relative; -} -.bootstrap-select .dropdown-menu li.active small { - color: rgba(255, 255, 255, 0.5) !important; -} -.bootstrap-select .dropdown-menu li.disabled a { - cursor: not-allowed; -} -.bootstrap-select .dropdown-menu li a { - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.bootstrap-select .dropdown-menu li a.opt { - position: relative; - padding-left: 2.25em; -} -.bootstrap-select .dropdown-menu li a span.check-mark { - display: none; -} -.bootstrap-select .dropdown-menu li a span.text { - display: inline-block; -} -.bootstrap-select .dropdown-menu li small { - padding-left: 0.5em; -} -.bootstrap-select .dropdown-menu .notify { - position: absolute; - bottom: 5px; - width: 96%; - margin: 0 2%; - min-height: 26px; - padding: 3px 5px; - background: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - pointer-events: none; - opacity: 0.9; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .no-results { - padding: 3px; - background: #f5f5f5; - margin: 0 5px; - white-space: nowrap; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option { - position: static; - display: inline; - padding: 0; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { - display: inline; -} -.bootstrap-select.fit-width .dropdown-toggle .caret { - position: static; - top: auto; - margin-top: -1px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - position: absolute; - display: inline-block; - right: 15px; - top: 5px; -} -.bootstrap-select.show-tick .dropdown-menu li a span.text { - margin-right: 34px; -} -.bootstrap-select .bs-ok-default:after { - content: ''; - display: block; - width: 0.5em; - height: 1em; - border-style: solid; - border-width: 0 0.26em 0.26em 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { - z-index: 1061; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { - content: ''; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid rgba(204, 204, 204, 0.2); - position: absolute; - bottom: -4px; - left: 9px; - display: none; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { - content: ''; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid white; - position: absolute; - bottom: -4px; - left: 10px; - display: none; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { - bottom: auto; - top: -4px; - border-top: 7px solid rgba(204, 204, 204, 0.2); - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { - bottom: auto; - top: -4px; - border-top: 6px solid white; - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { - right: 12px; - left: auto; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { - right: 13px; - left: auto; -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { - display: block; -} -.bs-searchbox, -.bs-actionsbox, -.bs-donebutton { - padding: 4px 8px; -} -.bs-actionsbox { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-actionsbox .btn-group button { - width: 50%; -} -.bs-donebutton { - float: left; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-donebutton .btn-group button { - width: 100%; -} -.bs-searchbox + .bs-actionsbox { - padding: 0 8px 4px; -} -.bs-searchbox .form-control { - margin-bottom: 0; - width: 100%; - float: none; -} - -/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : - * Move checkmarks to left hand side of the dropdown. - */ -.bootstrap-select .dropdown-menu > li > a { - padding: 3px 20px 3px 30px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - left: 10px; -} -/* End OPNsense edit to fix #2612. */ diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select.css index 56214371e..01c668321 100644 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select.css +++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/bootstrap-select.css @@ -1,29 +1,64 @@ /*! - * Bootstrap-select v1.9.3 (http://silviomoreto.github.io/bootstrap-select) + * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) * - * Copyright 2013-2015 bootstrap-select - * Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE) + * Copyright 2012-2018 SnapAppointments, LLC + * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) */ -/* set form-control on span height, which is used by liHeight to calculate height */ -span.form-control { - height: 34px !important; - padding: 6px 12px; +select.bs-select-hidden, +.bootstrap-select > select.bs-select-hidden, +select.selectpicker { + display: none !important; } .bootstrap-select { width: 348px \0; /*IE9 and below*/ } .bootstrap-select > .dropdown-toggle { + position: relative; width: 100%; - padding-right: 25px; z-index: 1; + text-align: right; + white-space: nowrap; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder, +.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder:active { + color: #000; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { + color: #ffffff; } .bootstrap-select > select { position: absolute !important; bottom: 0; left: 50%; - width: 0.11px !important; + display: block !important; + width: 0.5px !important; height: 100% !important; padding: 0 !important; opacity: 0 !important; @@ -37,133 +72,180 @@ span.form-control { z-index: 2; } .has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle { +.error .bootstrap-select .dropdown-toggle, +.bootstrap-select.is-invalid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { border-color: #b94a48; } +.bootstrap-select.is-valid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { + border-color: #28a745; +} .bootstrap-select.fit-width { width: auto !important; } .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { width: 348px; } -.bootstrap-select .dropdown-toggle:focus { - color:#FFFFFF !important; - outline-offset: -2px; -} + .bootstrap-select.form-control { margin-bottom: 0; padding: 0; border: none; } -.bootstrap-select.form-control:not([class*="col-"]) { +:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { width: 100%; } .bootstrap-select.form-control.input-group-btn { z-index: auto; } -.bootstrap-select.btn-group:not(.input-group-btn), -.bootstrap-select.btn-group[class*="col-"] { +.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.bootstrap-select:not(.input-group-btn), +.bootstrap-select[class*="col-"] { float: none; display: inline-block; margin-left: 0; } -.bootstrap-select.btn-group.dropdown-menu-right, -.bootstrap-select.btn-group[class*="col-"].dropdown-menu-right, -.row .bootstrap-select.btn-group[class*="col-"].dropdown-menu-right { +.bootstrap-select.dropdown-menu-right, +.bootstrap-select[class*="col-"].dropdown-menu-right, +.row .bootstrap-select[class*="col-"].dropdown-menu-right { float: right; } -.form-inline .bootstrap-select.btn-group, -.form-horizontal .bootstrap-select.btn-group, -.form-group .bootstrap-select.btn-group { +.form-inline .bootstrap-select, +.form-horizontal .bootstrap-select, +.form-group .bootstrap-select { margin-bottom: 0; } -.form-group-lg .bootstrap-select.btn-group.form-control, -.form-group-sm .bootstrap-select.btn-group.form-control { +.form-group-lg .bootstrap-select.form-control, +.form-group-sm .bootstrap-select.form-control { padding: 0; } -.form-inline .bootstrap-select.btn-group .form-control { +.form-group-lg .bootstrap-select.form-control .dropdown-toggle, +.form-group-sm .bootstrap-select.form-control .dropdown-toggle { + height: 100%; + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle, +.bootstrap-select.form-control-lg .dropdown-toggle { + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle { + padding: 0.25rem 0.5rem; +} +.bootstrap-select.form-control-lg .dropdown-toggle { + padding: 0.5rem 1rem; +} +.form-inline .bootstrap-select .form-control { width: 100%; } -.bootstrap-select.btn-group.disabled, -.bootstrap-select.btn-group > .disabled { +.bootstrap-select.disabled, +.bootstrap-select > .disabled { cursor: not-allowed; } -.bootstrap-select.btn-group.disabled:focus, -.bootstrap-select.btn-group > .disabled:focus { +.bootstrap-select.disabled:focus, +.bootstrap-select > .disabled:focus { outline: none !important; } -.bootstrap-select.btn-group.bs-container { +.bootstrap-select.bs-container { position: absolute; + top: 0; + left: 0; + height: 0 !important; + padding: 0 !important; } -.bootstrap-select.btn-group.bs-container .dropdown-menu { +.bootstrap-select.bs-container .dropdown-menu { z-index: 1060; } -.bootstrap-select.btn-group .dropdown-toggle .filter-option { +.bootstrap-select .dropdown-toggle:before { + content: ''; display: inline-block; - overflow: hidden; +} +.bootstrap-select .dropdown-toggle .filter-option { + position: absolute; + top: 0; + left: 0; + padding-top: inherit; + padding-right: inherit; + padding-bottom: inherit; + padding-left: inherit; + height: 100%; width: 100%; text-align: left; } -.bootstrap-select.btn-group .dropdown-toggle .caret { +.bootstrap-select .dropdown-toggle .filter-option-inner { + padding-right: inherit; +} +.bootstrap-select .dropdown-toggle .filter-option-inner-inner { + overflow: hidden; +} +.bootstrap-select .dropdown-toggle .caret { position: absolute; top: 50%; right: 12px; margin-top: -2px; vertical-align: middle; } -.bootstrap-select.btn-group[class*="col-"] .dropdown-toggle { +.input-group .bootstrap-select.form-control .dropdown-toggle { + border-radius: inherit; +} +.bootstrap-select[class*="col-"] .dropdown-toggle { width: 100%; } -.bootstrap-select.btn-group .dropdown-menu { - border-color:#1d1d1d !important; - -webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); - box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); +.bootstrap-select .dropdown-menu { min-width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .dropdown-menu.inner { +.bootstrap-select .dropdown-menu > .inner:focus { + outline: none !important; +} +.bootstrap-select .dropdown-menu.inner { position: static; float: none; border: 0; padding: 0; margin: 0; border-radius: 0; - min-width: 50px; -webkit-box-shadow: none; box-shadow: none; } -.bootstrap-select.btn-group .dropdown-menu li { +.bootstrap-select .dropdown-menu li { position: relative; } -.bootstrap-select.btn-group .dropdown-menu li.active small { - color: #fff; +.bootstrap-select .dropdown-menu li.active small { + color: rgba(255, 255, 255, 0.5) !important; } -.bootstrap-select.btn-group .dropdown-menu li.disabled a { +.bootstrap-select .dropdown-menu li.disabled a { cursor: not-allowed; } -.bootstrap-select.btn-group .dropdown-menu li a { +.bootstrap-select .dropdown-menu li a { cursor: pointer; -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.bootstrap-select.btn-group .dropdown-menu li a.opt { +.bootstrap-select .dropdown-menu li a.opt { position: relative; padding-left: 2.25em; } -.bootstrap-select.btn-group .dropdown-menu li a span.check-mark { +.bootstrap-select .dropdown-menu li a span.check-mark { display: none; } -.bootstrap-select.btn-group .dropdown-menu li a span.text { +.bootstrap-select .dropdown-menu li a span.text { display: inline-block; } -.bootstrap-select.btn-group .dropdown-menu li small { +.bootstrap-select .dropdown-menu li small { padding-left: 0.5em; } -.bootstrap-select.btn-group .dropdown-menu .notify { +.bootstrap-select .dropdown-menu .notify { position: absolute; bottom: 5px; width: 96%; @@ -180,33 +262,52 @@ span.form-control { -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .no-results { +.bootstrap-select .no-results { padding: 3px; background: #f5f5f5; margin: 0 5px; white-space: nowrap; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .filter-option { +.bootstrap-select.fit-width .dropdown-toggle .filter-option { position: static; + display: inline; + padding: 0; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .caret { +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { + display: inline; +} +.bootstrap-select.fit-width .dropdown-toggle .caret { position: static; top: auto; margin-top: -1px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark { +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { position: absolute; display: inline-block; right: 15px; - margin-top: 5px; + top: 5px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text { +.bootstrap-select.show-tick .dropdown-menu li a span.text { margin-right: 34px; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle { +.bootstrap-select .bs-ok-default:after { + content: ''; + display: block; + width: 0.5em; + height: 1em; + border-style: solid; + border-width: 0 0.26em 0.26em 0; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { z-index: 1061; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { content: ''; border-left: 7px solid transparent; border-right: 7px solid transparent; @@ -216,7 +317,7 @@ span.form-control { left: 9px; display: none; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { content: ''; border-left: 6px solid transparent; border-right: 6px solid transparent; @@ -226,28 +327,30 @@ span.form-control { left: 10px; display: none; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { bottom: auto; - top: -3px; + top: -4px; border-top: 7px solid rgba(204, 204, 204, 0.2); border-bottom: 0; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { bottom: auto; - top: -3px; + top: -4px; border-top: 6px solid white; border-bottom: 0; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { right: 12px; left: auto; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { right: 13px; left: auto; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { display: block; } .bs-searchbox, @@ -282,3 +385,14 @@ span.form-control { width: 100%; float: none; } + +/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : + * Move checkmarks to left hand side of the dropdown. + */ +.bootstrap-select .dropdown-menu > li > a { + padding: 3px 20px 3px 30px; +} +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { + left: 10px; +} +/* End OPNsense edit to fix #2612. */ diff --git a/misc/theme-vicuna/Makefile b/misc/theme-vicuna/Makefile index c6ef6b2ac..967d22e13 100644 --- a/misc/theme-vicuna/Makefile +++ b/misc/theme-vicuna/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= theme-vicuna PLUGIN_VERSION= 1.45 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= The vicuna theme - blue sapphire PLUGIN_MAINTAINER= rene@team-rebellion.net PLUGIN_NO_ABI= yes diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/bootstrap-select-1.13.3.scss b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/bootstrap-select1.scss similarity index 100% rename from misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/bootstrap-select-1.13.3.scss rename to misc/theme-vicuna/src/opnsense/www/themes/vicuna/assets/stylesheets/bootstrap-select1.scss diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select-1.13.3.css b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select-1.13.3.css deleted file mode 100644 index d8cfa48d2..000000000 --- a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select-1.13.3.css +++ /dev/null @@ -1,398 +0,0 @@ -/*! - * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) - * - * Copyright 2012-2018 SnapAppointments, LLC - * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) - */ - -select.bs-select-hidden, -.bootstrap-select > select.bs-select-hidden, -select.selectpicker { - display: none !important; -} -.bootstrap-select { - width: 348px \0; - /*IE9 and below*/ -} -.bootstrap-select > .dropdown-toggle { - position: relative; - width: 100%; - z-index: 1; - text-align: right; - white-space: nowrap; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder, -.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder:active { - color: #fff; -} -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, -.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { - color: #ffffff; -} -.bootstrap-select > select { - position: absolute !important; - bottom: 0; - left: 50%; - display: block !important; - width: 0.5px !important; - height: 100% !important; - padding: 0 !important; - opacity: 0 !important; - border: none; -} -.bootstrap-select > select.mobile-device { - top: 0; - left: 0; - display: block !important; - width: 100% !important; - z-index: 2; -} -.has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle, -.bootstrap-select.is-invalid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { - border-color: #b94a48; -} -.bootstrap-select.is-valid .dropdown-toggle, -.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { - border-color: #28a745; -} -.bootstrap-select.fit-width { - width: auto !important; -} -.bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { - width: 348px; -} - -.bootstrap-select.form-control { - margin-bottom: 0; - padding: 0; - border: none; -} -:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { - width: 100%; -} -.bootstrap-select.form-control.input-group-btn { - z-index: auto; -} -.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.bootstrap-select:not(.input-group-btn), -.bootstrap-select[class*="col-"] { - float: none; - display: inline-block; - margin-left: 0; -} -.bootstrap-select.dropdown-menu-right, -.bootstrap-select[class*="col-"].dropdown-menu-right, -.row .bootstrap-select[class*="col-"].dropdown-menu-right { - float: right; -} -.form-inline .bootstrap-select, -.form-horizontal .bootstrap-select, -.form-group .bootstrap-select { - margin-bottom: 0; -} -.form-group-lg .bootstrap-select.form-control, -.form-group-sm .bootstrap-select.form-control { - padding: 0; -} -.form-group-lg .bootstrap-select.form-control .dropdown-toggle, -.form-group-sm .bootstrap-select.form-control .dropdown-toggle { - height: 100%; - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle, -.bootstrap-select.form-control-lg .dropdown-toggle { - font-size: inherit; - line-height: inherit; - border-radius: inherit; -} -.bootstrap-select.form-control-sm .dropdown-toggle { - padding: 0.25rem 0.5rem; -} -.bootstrap-select.form-control-lg .dropdown-toggle { - padding: 0.5rem 1rem; -} -.form-inline .bootstrap-select .form-control { - width: 100%; -} -.bootstrap-select.disabled, -.bootstrap-select > .disabled { - cursor: not-allowed; -} -.bootstrap-select.disabled:focus, -.bootstrap-select > .disabled:focus { - outline: none !important; -} -.bootstrap-select.bs-container { - position: absolute; - top: 0; - left: 0; - height: 0 !important; - padding: 0 !important; -} -.bootstrap-select.bs-container .dropdown-menu { - z-index: 1060; -} -.bootstrap-select .dropdown-toggle:before { - content: ''; - display: inline-block; -} -.bootstrap-select .dropdown-toggle .filter-option { - position: absolute; - top: 0; - left: 0; - padding-top: inherit; - padding-right: inherit; - padding-bottom: inherit; - padding-left: inherit; - height: 100%; - width: 100%; - text-align: left; -} -.bootstrap-select .dropdown-toggle .filter-option-inner { - padding-right: inherit; -} -.bootstrap-select .dropdown-toggle .filter-option-inner-inner { - overflow: hidden; -} -.bootstrap-select .dropdown-toggle .caret { - position: absolute; - top: 50%; - right: 12px; - margin-top: -2px; - vertical-align: middle; -} -.input-group .bootstrap-select.form-control .dropdown-toggle { - border-radius: inherit; -} -.bootstrap-select[class*="col-"] .dropdown-toggle { - width: 100%; -} -.bootstrap-select .dropdown-menu { - min-width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .dropdown-menu > .inner:focus { - outline: none !important; -} -.bootstrap-select .dropdown-menu.inner { - position: static; - float: none; - border: 0; - padding: 0; - margin: 0; - border-radius: 0; - -webkit-box-shadow: none; - box-shadow: none; -} -.bootstrap-select .dropdown-menu li { - position: relative; -} -.bootstrap-select .dropdown-menu li.active small { - color: rgba(255, 255, 255, 0.5) !important; -} -.bootstrap-select .dropdown-menu li.disabled a { - cursor: not-allowed; -} -.bootstrap-select .dropdown-menu li a { - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.bootstrap-select .dropdown-menu li a.opt { - position: relative; - padding-left: 2.25em; -} -.bootstrap-select .dropdown-menu li a span.check-mark { - display: none; -} -.bootstrap-select .dropdown-menu li a span.text { - display: inline-block; -} -.bootstrap-select .dropdown-menu li small { - padding-left: 0.5em; -} -.bootstrap-select .dropdown-menu .notify { - position: absolute; - bottom: 5px; - width: 96%; - margin: 0 2%; - min-height: 26px; - padding: 3px 5px; - background: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - pointer-events: none; - opacity: 0.9; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bootstrap-select .no-results { - padding: 3px; - background: #f5f5f5; - margin: 0 5px; - white-space: nowrap; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option { - position: static; - display: inline; - padding: 0; -} -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, -.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { - display: inline; -} -.bootstrap-select.fit-width .dropdown-toggle .caret { - position: static; - top: auto; - margin-top: -1px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - position: absolute; - display: inline-block; - right: 15px; - top: 5px; -} -.bootstrap-select.show-tick .dropdown-menu li a span.text { - margin-right: 34px; -} -.bootstrap-select .bs-ok-default:after { - content: ''; - display: block; - width: 0.5em; - height: 1em; - border-style: solid; - border-width: 0 0.26em 0.26em 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { - z-index: 1061; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { - content: ''; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid rgba(204, 204, 204, 0.2); - position: absolute; - bottom: -4px; - left: 9px; - display: none; -} -.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { - content: ''; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid white; - position: absolute; - bottom: -4px; - left: 10px; - display: none; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { - bottom: auto; - top: -4px; - border-top: 7px solid rgba(204, 204, 204, 0.2); - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { - bottom: auto; - top: -4px; - border-top: 6px solid white; - border-bottom: 0; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { - right: 12px; - left: auto; -} -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { - right: 13px; - left: auto; -} -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, -.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { - display: block; -} -.bs-searchbox, -.bs-actionsbox, -.bs-donebutton { - padding: 4px 8px; -} -.bs-actionsbox { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-actionsbox .btn-group button { - width: 50%; -} -.bs-donebutton { - float: left; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.bs-donebutton .btn-group button { - width: 100%; -} -.bs-searchbox + .bs-actionsbox { - padding: 0 8px 4px; -} -.bs-searchbox .form-control { - margin-bottom: 0; - width: 100%; - float: none; -} - -/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : - * Move checkmarks to left hand side of the dropdown. - */ -.bootstrap-select .dropdown-menu > li > a { - padding: 3px 20px 3px 30px; -} -.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { - left: 10px; -} -/* End OPNsense edit to fix #2612. */ diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select.css b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select.css index 56214371e..d8cfa48d2 100644 --- a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select.css +++ b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/bootstrap-select.css @@ -1,29 +1,64 @@ /*! - * Bootstrap-select v1.9.3 (http://silviomoreto.github.io/bootstrap-select) + * Bootstrap-select v1.13.3 (https://developer.snapappointments.com/bootstrap-select) * - * Copyright 2013-2015 bootstrap-select - * Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE) + * Copyright 2012-2018 SnapAppointments, LLC + * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) */ -/* set form-control on span height, which is used by liHeight to calculate height */ -span.form-control { - height: 34px !important; - padding: 6px 12px; +select.bs-select-hidden, +.bootstrap-select > select.bs-select-hidden, +select.selectpicker { + display: none !important; } .bootstrap-select { width: 348px \0; /*IE9 and below*/ } .bootstrap-select > .dropdown-toggle { + position: relative; width: 100%; - padding-right: 25px; z-index: 1; + text-align: right; + white-space: nowrap; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder, +.bootstrap-select > .dropdown-toggle.bs-placeholder:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder:active { + color: #fff; +} +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:hover, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:focus, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-primary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-secondary:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-success:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-danger:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-info:active, +.bootstrap-select > .dropdown-toggle.bs-placeholder.btn-dark:active { + color: #ffffff; } .bootstrap-select > select { position: absolute !important; bottom: 0; left: 50%; - width: 0.11px !important; + display: block !important; + width: 0.5px !important; height: 100% !important; padding: 0 !important; opacity: 0 !important; @@ -37,133 +72,180 @@ span.form-control { z-index: 2; } .has-error .bootstrap-select .dropdown-toggle, -.error .bootstrap-select .dropdown-toggle { +.error .bootstrap-select .dropdown-toggle, +.bootstrap-select.is-invalid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:invalid + .dropdown-toggle { border-color: #b94a48; } +.bootstrap-select.is-valid .dropdown-toggle, +.was-validated .bootstrap-select .selectpicker:valid + .dropdown-toggle { + border-color: #28a745; +} .bootstrap-select.fit-width { width: auto !important; } .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) { width: 348px; } -.bootstrap-select .dropdown-toggle:focus { - color:#FFFFFF !important; - outline-offset: -2px; -} + .bootstrap-select.form-control { margin-bottom: 0; padding: 0; border: none; } -.bootstrap-select.form-control:not([class*="col-"]) { +:not(.input-group) > .bootstrap-select.form-control:not([class*="col-"]) { width: 100%; } .bootstrap-select.form-control.input-group-btn { z-index: auto; } -.bootstrap-select.btn-group:not(.input-group-btn), -.bootstrap-select.btn-group[class*="col-"] { +.bootstrap-select.form-control.input-group-btn:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.bootstrap-select:not(.input-group-btn), +.bootstrap-select[class*="col-"] { float: none; display: inline-block; margin-left: 0; } -.bootstrap-select.btn-group.dropdown-menu-right, -.bootstrap-select.btn-group[class*="col-"].dropdown-menu-right, -.row .bootstrap-select.btn-group[class*="col-"].dropdown-menu-right { +.bootstrap-select.dropdown-menu-right, +.bootstrap-select[class*="col-"].dropdown-menu-right, +.row .bootstrap-select[class*="col-"].dropdown-menu-right { float: right; } -.form-inline .bootstrap-select.btn-group, -.form-horizontal .bootstrap-select.btn-group, -.form-group .bootstrap-select.btn-group { +.form-inline .bootstrap-select, +.form-horizontal .bootstrap-select, +.form-group .bootstrap-select { margin-bottom: 0; } -.form-group-lg .bootstrap-select.btn-group.form-control, -.form-group-sm .bootstrap-select.btn-group.form-control { +.form-group-lg .bootstrap-select.form-control, +.form-group-sm .bootstrap-select.form-control { padding: 0; } -.form-inline .bootstrap-select.btn-group .form-control { +.form-group-lg .bootstrap-select.form-control .dropdown-toggle, +.form-group-sm .bootstrap-select.form-control .dropdown-toggle { + height: 100%; + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle, +.bootstrap-select.form-control-lg .dropdown-toggle { + font-size: inherit; + line-height: inherit; + border-radius: inherit; +} +.bootstrap-select.form-control-sm .dropdown-toggle { + padding: 0.25rem 0.5rem; +} +.bootstrap-select.form-control-lg .dropdown-toggle { + padding: 0.5rem 1rem; +} +.form-inline .bootstrap-select .form-control { width: 100%; } -.bootstrap-select.btn-group.disabled, -.bootstrap-select.btn-group > .disabled { +.bootstrap-select.disabled, +.bootstrap-select > .disabled { cursor: not-allowed; } -.bootstrap-select.btn-group.disabled:focus, -.bootstrap-select.btn-group > .disabled:focus { +.bootstrap-select.disabled:focus, +.bootstrap-select > .disabled:focus { outline: none !important; } -.bootstrap-select.btn-group.bs-container { +.bootstrap-select.bs-container { position: absolute; + top: 0; + left: 0; + height: 0 !important; + padding: 0 !important; } -.bootstrap-select.btn-group.bs-container .dropdown-menu { +.bootstrap-select.bs-container .dropdown-menu { z-index: 1060; } -.bootstrap-select.btn-group .dropdown-toggle .filter-option { +.bootstrap-select .dropdown-toggle:before { + content: ''; display: inline-block; - overflow: hidden; +} +.bootstrap-select .dropdown-toggle .filter-option { + position: absolute; + top: 0; + left: 0; + padding-top: inherit; + padding-right: inherit; + padding-bottom: inherit; + padding-left: inherit; + height: 100%; width: 100%; text-align: left; } -.bootstrap-select.btn-group .dropdown-toggle .caret { +.bootstrap-select .dropdown-toggle .filter-option-inner { + padding-right: inherit; +} +.bootstrap-select .dropdown-toggle .filter-option-inner-inner { + overflow: hidden; +} +.bootstrap-select .dropdown-toggle .caret { position: absolute; top: 50%; right: 12px; margin-top: -2px; vertical-align: middle; } -.bootstrap-select.btn-group[class*="col-"] .dropdown-toggle { +.input-group .bootstrap-select.form-control .dropdown-toggle { + border-radius: inherit; +} +.bootstrap-select[class*="col-"] .dropdown-toggle { width: 100%; } -.bootstrap-select.btn-group .dropdown-menu { - border-color:#1d1d1d !important; - -webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); - box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6); +.bootstrap-select .dropdown-menu { min-width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .dropdown-menu.inner { +.bootstrap-select .dropdown-menu > .inner:focus { + outline: none !important; +} +.bootstrap-select .dropdown-menu.inner { position: static; float: none; border: 0; padding: 0; margin: 0; border-radius: 0; - min-width: 50px; -webkit-box-shadow: none; box-shadow: none; } -.bootstrap-select.btn-group .dropdown-menu li { +.bootstrap-select .dropdown-menu li { position: relative; } -.bootstrap-select.btn-group .dropdown-menu li.active small { - color: #fff; +.bootstrap-select .dropdown-menu li.active small { + color: rgba(255, 255, 255, 0.5) !important; } -.bootstrap-select.btn-group .dropdown-menu li.disabled a { +.bootstrap-select .dropdown-menu li.disabled a { cursor: not-allowed; } -.bootstrap-select.btn-group .dropdown-menu li a { +.bootstrap-select .dropdown-menu li a { cursor: pointer; -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } -.bootstrap-select.btn-group .dropdown-menu li a.opt { +.bootstrap-select .dropdown-menu li a.opt { position: relative; padding-left: 2.25em; } -.bootstrap-select.btn-group .dropdown-menu li a span.check-mark { +.bootstrap-select .dropdown-menu li a span.check-mark { display: none; } -.bootstrap-select.btn-group .dropdown-menu li a span.text { +.bootstrap-select .dropdown-menu li a span.text { display: inline-block; } -.bootstrap-select.btn-group .dropdown-menu li small { +.bootstrap-select .dropdown-menu li small { padding-left: 0.5em; } -.bootstrap-select.btn-group .dropdown-menu .notify { +.bootstrap-select .dropdown-menu .notify { position: absolute; bottom: 5px; width: 96%; @@ -180,33 +262,52 @@ span.form-control { -moz-box-sizing: border-box; box-sizing: border-box; } -.bootstrap-select.btn-group .no-results { +.bootstrap-select .no-results { padding: 3px; background: #f5f5f5; margin: 0 5px; white-space: nowrap; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .filter-option { +.bootstrap-select.fit-width .dropdown-toggle .filter-option { position: static; + display: inline; + padding: 0; } -.bootstrap-select.btn-group.fit-width .dropdown-toggle .caret { +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner, +.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner { + display: inline; +} +.bootstrap-select.fit-width .dropdown-toggle .caret { position: static; top: auto; margin-top: -1px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark { +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { position: absolute; display: inline-block; right: 15px; - margin-top: 5px; + top: 5px; } -.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text { +.bootstrap-select.show-tick .dropdown-menu li a span.text { margin-right: 34px; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle { +.bootstrap-select .bs-ok-default:after { + content: ''; + display: block; + width: 0.5em; + height: 1em; + border-style: solid; + border-width: 0 0.26em 0.26em 0; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle { z-index: 1061; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before { content: ''; border-left: 7px solid transparent; border-right: 7px solid transparent; @@ -216,7 +317,7 @@ span.form-control { left: 9px; display: none; } -.bootstrap-select.show-menu-arrow .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after { content: ''; border-left: 6px solid transparent; border-right: 6px solid transparent; @@ -226,28 +327,30 @@ span.form-control { left: 10px; display: none; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before { bottom: auto; - top: -3px; + top: -4px; border-top: 7px solid rgba(204, 204, 204, 0.2); border-bottom: 0; } -.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after { bottom: auto; - top: -3px; + top: -4px; border-top: 6px solid white; border-bottom: 0; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before { right: 12px; left: auto; } -.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after { right: 13px; left: auto; } -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:before, -.bootstrap-select.show-menu-arrow.open > .dropdown-toggle:after { +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:before, +.bootstrap-select.show-menu-arrow.open > .dropdown-toggle .filter-option:after, +.bootstrap-select.show-menu-arrow.show > .dropdown-toggle .filter-option:after { display: block; } .bs-searchbox, @@ -282,3 +385,14 @@ span.form-control { width: 100%; float: none; } + +/* OPNsense edit to fix https://github.com/opnsense/core/issues/2612 : + * Move checkmarks to left hand side of the dropdown. + */ +.bootstrap-select .dropdown-menu > li > a { + padding: 3px 20px 3px 30px; +} +.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark { + left: 10px; +} +/* End OPNsense edit to fix #2612. */