github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

conflict resolve 

- added "Fix Select2 heights" #2178
- rebuild dist files & synced to docs
pull/2183/head
REJack 2019-07-29 21:37:35 +02:00
parent 8845f6a8e5
commit 14f59c34f2
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
17 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
build/scss/plugins/_select2.scss
View File

@ -10,17 +10,16 @@
&:active { &:active {
outline: none; outline: none;
} }
.select2-selection--single { .select2-selection--single {
border: 1px solid $gray-x-light; border: 1px solid $gray-x-light;
//border-radius: $input-radius; //border-radius: $input-radius;
height: 34px;
padding: 6px 12px; padding: 6px 12px;
height: $input-height;
} }
} }
.select2-container--default.select2-container--open { .select2-container--default.select2-container--open {
border-color: theme-color('primary'); border-color: theme-color("primary");
} }
.select2-dropdown { .select2-dropdown {
@ -29,30 +28,31 @@
} }
.select2-container--default .select2-results__option--highlighted[aria-selected] { .select2-container--default .select2-results__option--highlighted[aria-selected] {
background-color: theme-color('primary'); background-color: theme-color("primary");
color: $white; color: white;
} }
.select2-results__option { .select2-results__option {
padding: 6px 12px; padding: 6px 12px;
user-select: none; user-select: none;
-webkit-user-select: none;
} }
.select2-container .select2-selection--single .select2-selection__rendered { .select2-container .select2-selection--single .select2-selection__rendered {
height: auto;
margin-top: -4px;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
height: auto;
margin-top: -3px;
} }
.select2-container[dir='rtl'] .select2-selection--single .select2-selection__rendered { .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
padding-left: 20px;
padding-right: 6px; padding-right: 6px;
padding-left: 20px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow { .select2-container--default .select2-selection--single .select2-selection__arrow {
height: 28px; height: 31px;
right: 3px; right: 6px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow b { .select2-container--default .select2-selection--single .select2-selection__arrow b {
@ -63,10 +63,9 @@
.select2-search--inline { .select2-search--inline {
.select2-search__field { .select2-search__field {
border: 1px solid $gray-x-light; border: 1px solid $gray-x-light;
&:focus { &:focus {
border: 1px solid theme-color('primary');
outline: none; outline: none;
border: 1px solid theme-color("primary");
} }
} }
} }
@ -77,20 +76,20 @@
.select2-container--default .select2-results__option[aria-selected=true] { .select2-container--default .select2-results__option[aria-selected=true] {
background-color: #ddd; background-color: #ddd;
&, &,
&:hover { &:hover {
color: $gray-700; color: #444;
} }
} }
//Multiple select //Multiple select
.select2-container--default { .select2-container--default {
.select2-selection--multiple { .select2-selection--multiple {
min-height: $input-height;
border: 1px solid $gray-x-light; border: 1px solid $gray-x-light;
//border-radius: $input-radius;
&:focus { &:focus {
border-color: theme-color('primary'); border-color: theme-color("primary");
} }
.select2-selection__rendered li:first-child.select2-search.select2-search--inline { .select2-selection__rendered li:first-child.select2-search.select2-search--inline {
@ -101,23 +100,21 @@
} }
} }
} }
&.select2-container--focus .select2-selection--multiple { &.select2-container--focus .select2-selection--multiple {
border-color: $gray-x-light; border-color: $gray-x-light;
} }
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice { .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: theme-color('primary'); background-color: theme-color("primary");
border-color: darken(theme-color('primary'), 5%); border-color: darken(theme-color("primary"), 5%);
padding: 0 10px;
color: $white; color: $white;
padding: 1px 10px;
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove { .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: rgba(255, 255, 255, 0.7);
margin-right: 5px; margin-right: 5px;
color: rgba(255, 255, 255, 0.7);
&:hover { &:hover {
color: $white; color: $white;
} }

27
dist/css/adminlte.css vendored
View File

@ -17754,8 +17754,8 @@ html.maximized-card {
.select2-container--default .select2-selection--single, .select2-container--default .select2-selection--single,
.select2-selection .select2-selection--single { .select2-selection .select2-selection--single {
border: 1px solid #d2d6de; border: 1px solid #d2d6de;
height: 34px;
padding: 6px 12px; padding: 6px 12px;
height: calc(2.25rem + 2px);
} }
.select2-container--default.select2-container--open { .select2-container--default.select2-container--open {
@ -17768,32 +17768,32 @@ html.maximized-card {
.select2-container--default .select2-results__option--highlighted[aria-selected] { .select2-container--default .select2-results__option--highlighted[aria-selected] {
background-color: #007bff; background-color: #007bff;
color: #ffffff; color: white;
} }
.select2-results__option { .select2-results__option {
padding: 6px 12px; padding: 6px 12px;
-webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
-webkit-user-select: none;
} }
.select2-container .select2-selection--single .select2-selection__rendered { .select2-container .select2-selection--single .select2-selection__rendered {
height: auto;
margin-top: -4px;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
height: auto;
margin-top: -3px;
} }
.select2-container[dir='rtl'] .select2-selection--single .select2-selection__rendered { .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
padding-left: 20px;
padding-right: 6px; padding-right: 6px;
padding-left: 20px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow { .select2-container--default .select2-selection--single .select2-selection__arrow {
height: 28px; height: 31px;
right: 3px; right: 6px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow b { .select2-container--default .select2-selection--single .select2-selection__arrow b {
@ -17807,8 +17807,8 @@ html.maximized-card {
.select2-dropdown .select2-search__field:focus, .select2-dropdown .select2-search__field:focus,
.select2-search--inline .select2-search__field:focus { .select2-search--inline .select2-search__field:focus {
border: 1px solid #007bff;
outline: none; outline: none;
border: 1px solid #007bff;
} }
.select2-container--default .select2-results__option[aria-disabled=true] { .select2-container--default .select2-results__option[aria-disabled=true] {
@ -17820,10 +17820,11 @@ html.maximized-card {
} }
.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover { .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
color: #495057; color: #444;
} }
.select2-container--default .select2-selection--multiple { .select2-container--default .select2-selection--multiple {
min-height: calc(2.25rem + 2px);
border: 1px solid #d2d6de; border: 1px solid #d2d6de;
} }
@ -17846,13 +17847,13 @@ html.maximized-card {
.select2-container--default .select2-selection--multiple .select2-selection__choice { .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #007bff; background-color: #007bff;
border-color: #006fe6; border-color: #006fe6;
padding: 0 10px;
color: #ffffff; color: #ffffff;
padding: 1px 10px;
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove { .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: rgba(255, 255, 255, 0.7);
margin-right: 5px; margin-right: 5px;
color: rgba(255, 255, 255, 0.7);
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover { .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {

2
dist/css/adminlte.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/adminlte.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/adminlte.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.js vendored
View File

@ -1051,7 +1051,7 @@
$(this).data(DATA_KEY, typeof config === 'string' ? data : config); $(this).data(DATA_KEY, typeof config === 'string' ? data : config);
} }
if (typeof config === 'string' && config.match(/remove|toggle|toggleMaximize/)) { if (typeof config === 'string' && config.match(/collapse|expand|remove|toggle|toggleMaximize/)) {
data[config](); data[config]();
} else if (typeof config === 'object') { } else if (typeof config === 'object') {
data._init($(this)); data._init($(this));

2
dist/js/adminlte.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

27
docs/assets/css/adminlte.css
View File

@ -17754,8 +17754,8 @@ html.maximized-card {
.select2-container--default .select2-selection--single, .select2-container--default .select2-selection--single,
.select2-selection .select2-selection--single { .select2-selection .select2-selection--single {
border: 1px solid #d2d6de; border: 1px solid #d2d6de;
height: 34px;
padding: 6px 12px; padding: 6px 12px;
height: calc(2.25rem + 2px);
} }
.select2-container--default.select2-container--open { .select2-container--default.select2-container--open {
@ -17768,32 +17768,32 @@ html.maximized-card {
.select2-container--default .select2-results__option--highlighted[aria-selected] { .select2-container--default .select2-results__option--highlighted[aria-selected] {
background-color: #007bff; background-color: #007bff;
color: #ffffff; color: white;
} }
.select2-results__option { .select2-results__option {
padding: 6px 12px; padding: 6px 12px;
-webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
-webkit-user-select: none;
} }
.select2-container .select2-selection--single .select2-selection__rendered { .select2-container .select2-selection--single .select2-selection__rendered {
height: auto;
margin-top: -4px;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
height: auto;
margin-top: -3px;
} }
.select2-container[dir='rtl'] .select2-selection--single .select2-selection__rendered { .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
padding-left: 20px;
padding-right: 6px; padding-right: 6px;
padding-left: 20px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow { .select2-container--default .select2-selection--single .select2-selection__arrow {
height: 28px; height: 31px;
right: 3px; right: 6px;
} }
.select2-container--default .select2-selection--single .select2-selection__arrow b { .select2-container--default .select2-selection--single .select2-selection__arrow b {
@ -17807,8 +17807,8 @@ html.maximized-card {
.select2-dropdown .select2-search__field:focus, .select2-dropdown .select2-search__field:focus,
.select2-search--inline .select2-search__field:focus { .select2-search--inline .select2-search__field:focus {
border: 1px solid #007bff;
outline: none; outline: none;
border: 1px solid #007bff;
} }
.select2-container--default .select2-results__option[aria-disabled=true] { .select2-container--default .select2-results__option[aria-disabled=true] {
@ -17820,10 +17820,11 @@ html.maximized-card {
} }
.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover { .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
color: #495057; color: #444;
} }
.select2-container--default .select2-selection--multiple { .select2-container--default .select2-selection--multiple {
min-height: calc(2.25rem + 2px);
border: 1px solid #d2d6de; border: 1px solid #d2d6de;
} }
@ -17846,13 +17847,13 @@ html.maximized-card {
.select2-container--default .select2-selection--multiple .select2-selection__choice { .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #007bff; background-color: #007bff;
border-color: #006fe6; border-color: #006fe6;
padding: 0 10px;
color: #ffffff; color: #ffffff;
padding: 1px 10px;
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove { .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: rgba(255, 255, 255, 0.7);
margin-right: 5px; margin-right: 5px;
color: rgba(255, 255, 255, 0.7);
} }
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover { .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {

2
docs/assets/css/adminlte.css.map
View File

File diff suppressed because one or more lines are too long

2
docs/assets/css/adminlte.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/css/adminlte.min.css.map
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/adminlte.js
View File

@ -1051,7 +1051,7 @@
$(this).data(DATA_KEY, typeof config === 'string' ? data : config); $(this).data(DATA_KEY, typeof config === 'string' ? data : config);
} }
if (typeof config === 'string' && config.match(/remove|toggle|toggleMaximize/)) { if (typeof config === 'string' && config.match(/collapse|expand|remove|toggle|toggleMaximize/)) {
data[config](); data[config]();
} else if (typeof config === 'object') { } else if (typeof config === 'object') {
data._init($(this)); data._init($(this));

2
docs/assets/js/adminlte.js.map
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/adminlte.min.js.map
View File

File diff suppressed because one or more lines are too long