1
0
mirror of synced 2024-11-29 16:16:02 +03:00

Fixed SASS error

This fixes the SASS error caused by the `&[dir="rtl"]` selector in
the `_single.scss` and `_multiple.scss` files. We were expecting
these files to be nested within the `.select-container` class, which
would have made this a non-error as the `&` would refer to the
`.select2-container` class that was wrapping the `@import`.

This moves the `@import` statements into the `.select2-container`
class, so this no longer triggers an error in the Ruby version of
SASS.

This closes https://github.com/select2/select2/issues/2896
This commit is contained in:
Kevin Brown 2015-01-06 17:50:44 -05:00
parent dcfaa5f628
commit 938993302f
3 changed files with 37 additions and 41 deletions

18
dist/css/select2.css vendored
View File

@ -4,41 +4,37 @@
margin: 0; margin: 0;
position: relative; position: relative;
vertical-align: middle; } vertical-align: middle; }
.select2-container .select2-selection--single {
.select2-selection--single {
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; cursor: pointer;
display: block; display: block;
height: 28px; height: 28px;
user-select: none; user-select: none;
-webkit-user-select: none; } -webkit-user-select: none; }
.select2-selection--single .select2-selection__rendered { .select2-container .select2-selection--single .select2-selection__rendered {
display: block; display: block;
overflow: hidden; overflow: hidden;
padding-left: 8px; padding-left: 8px;
padding-right: 20px; padding-right: 20px;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
[dir="rtl"] .select2-selection--single .select2-selection__rendered {
padding-right: 8px; padding-right: 8px;
padding-left: 20px; } padding-left: 20px; }
.select2-container .select2-selection--multiple {
.select2-selection--multiple {
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; cursor: pointer;
display: block; display: block;
min-height: 32px; min-height: 32px;
user-select: none; user-select: none;
-webkit-user-select: none; } -webkit-user-select: none; }
.select2-selection--multiple .select2-selection__rendered { .select2-container .select2-selection--multiple .select2-selection__rendered {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
padding-left: 8px; padding-left: 8px;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.select2-container .select2-search--inline {
.select2-search--inline {
float: left; } float: left; }
.select2-search--inline .select2-search__field { .select2-container .select2-search--inline .select2-search__field {
border: none; border: none;
font-size: 100%; font-size: 100%;
margin-top: 5px; } margin-top: 5px; }

File diff suppressed because one or more lines are too long

View File

@ -5,10 +5,10 @@
margin: 0; margin: 0;
position: relative; position: relative;
vertical-align: middle; vertical-align: middle;
}
@import "single"; @import "single";
@import "multiple"; @import "multiple";
}
@import "dropdown"; @import "dropdown";