diff options
Diffstat (limited to 'WebContent/VAADIN/themes/valo/components/_combobox.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_combobox.scss | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_combobox.scss b/WebContent/VAADIN/themes/valo/components/_combobox.scss index e514dc8e20..4e5cd5bbac 100644 --- a/WebContent/VAADIN/themes/valo/components/_combobox.scss +++ b/WebContent/VAADIN/themes/valo/components/_combobox.scss @@ -79,12 +79,12 @@ } .#{$primary-stylename}-small { - @include valo-combobox-style($unit-size: $v-unit-size--small, $bevel: null, $shadow: null, $gradient: null, $border: null, $border-radius: null, $background-color: null); + @include valo-combobox-style($unit-size: $v-unit-size--small, $bevel: null, $shadow: null, $gradient: null, $border: null, $border-radius: null, $background-color: null, $states: normal); font-size: $v-font-size--small; } .#{$primary-stylename}-large { - @include valo-combobox-style($unit-size: $v-unit-size--large, $bevel: null, $shadow: null, $gradient: null, $border: null, $border-radius: null, $background-color: null); + @include valo-combobox-style($unit-size: $v-unit-size--large, $bevel: null, $shadow: null, $gradient: null, $border: null, $border-radius: null, $background-color: null, $states: normal); font-size: $v-font-size--large; } } @@ -110,7 +110,8 @@ $bevel: $v-textfield-bevel, $shadow: $v-textfield-shadow, - $primary-stylename: v-filterselect + $primary-stylename: v-filterselect, + $states: normal focus disabled ) { height: $unit-size; @@ -127,7 +128,8 @@ $background-color: $background-color, $font-color: $font-color, $font-size: $font-size, - $font-weight: $font-weight); + $font-weight: $font-weight, + $states: $states); } .v-icon + .#{$primary-stylename}-input { @@ -201,7 +203,9 @@ $gradient: none, $bevel: $v-bevel, - $shadow: $v-shadow + $shadow: $v-shadow, + + $states: normal focus disabled ) { @include box-sizing(border-box); @include valo-textfield-style($unit-size: $unit-size, @@ -214,7 +218,8 @@ $border-radius: $border-radius, $gradient: $gradient, $bevel: $bevel, - $shadow: $shadow); + $shadow: $shadow, + $states: $states); width: 100% !important; // Need to override calculated inline style which is sometimes added height: 100%; padding-right: round($unit-size * 1.2); |