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

Merge pull request #2178 from maxwellmc/v3-dev 

Fix Select2 heights
pull/2184/head
Raphael Jackstadt 2019-07-21 21:15:49 +02:00 committed by GitHub
parent 4c0f3d0baf 7745078a45
commit a5bbef158a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
border: 1px solid $gray-x-light;
//border-radius: $input-radius;
padding: 6px 12px;
height: 34px;
height: $input-height;
}
}
@ -43,7 +43,7 @@
padding-left: 0;
padding-right: 0;
height: auto;
margin-top: -4px;
margin-top: -3px;
}
.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
@ -52,8 +52,8 @@
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 28px;
right: 3px;
height: 31px;
right: 6px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow b {
@ -86,6 +86,7 @@
//Multiple select
.select2-container--default {
.select2-selection--multiple {
min-height: $input-height;
border: 1px solid $gray-x-light;
//border-radius: $input-radius;
&:focus {
@ -108,7 +109,7 @@
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: theme-color("primary");
border-color: darken(theme-color("primary"), 5%);
padding: 1px 10px;
padding: 0 10px;
color: $white;
}

11
dist/css/adminlte.css vendored
View File

@ -18770,7 +18770,7 @@ html.maximized-card {
.select2-selection .select2-selection--single {
border: 1px solid #d2d6de;
padding: 6px 12px;
height: 34px;
height: calc(2.25rem + 2px);
}
.select2-container--default.select2-container--open {
@ -18798,7 +18798,7 @@ html.maximized-card {
padding-left: 0;
padding-right: 0;
height: auto;
margin-top: -4px;
margin-top: -3px;
}
.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
@ -18807,8 +18807,8 @@ html.maximized-card {
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 28px;
right: 3px;
height: 31px;
right: 6px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow b {
@ -18839,6 +18839,7 @@ html.maximized-card {
}
.select2-container--default .select2-selection--multiple {
min-height: calc(2.25rem + 2px);
border: 1px solid #d2d6de;
}
@ -18861,7 +18862,7 @@ html.maximized-card {
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #007bff;
border-color: #006fe6;
padding: 1px 10px;
padding: 0 10px;
color: #ffffff;
}

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