lisone/AdminLTE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolve

Browse Source 
- added "Fix Select2 heights" #2178
- rebuild dist files & synced to docs
This commit is contained in:
REJack
2019-07-29 21:37:35 +02:00
parent 8845f6a8e5
commit 14f59c34f2
17 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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