summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/valo/components/_combobox.scss
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2014-08-07 22:15:01 +0300
committerVaadin Code Review <review@vaadin.com>2014-08-11 18:26:34 +0000
commitadc6748d6bcd3c4eac50855160ab060e3551d2b3 (patch)
treeaef9fd3438cba75ed6f663f0817c4bebbd4fea8b /WebContent/VAADIN/themes/valo/components/_combobox.scss
parent328c4ca30baaf95885b1297ffd2f60f0bb614b52 (diff)
downloadvaadin-framework-adc6748d6bcd3c4eac50855160ab060e3551d2b3.tar.gz
vaadin-framework-adc6748d6bcd3c4eac50855160ab060e3551d2b3.zip
Split common-stylenames to individual component files (#14374)
Moved notification and valo-menu styles to the components folder as well, and added them to the $v-included-components list. Additional styles are now also controlled with a list variable, which lists all components whose additional styles should be included in the build. Change-Id: Ifb8d49d71622decf8fa0d4875985fcafd908a1f8
Diffstat (limited to 'WebContent/VAADIN/themes/valo/components/_combobox.scss')
-rw-r--r--WebContent/VAADIN/themes/valo/components/_combobox.scss31
1 files changed, 30 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_combobox.scss b/WebContent/VAADIN/themes/valo/components/_combobox.scss
index 51ec65e55f..e514dc8e20 100644
--- a/WebContent/VAADIN/themes/valo/components/_combobox.scss
+++ b/WebContent/VAADIN/themes/valo/components/_combobox.scss
@@ -1,4 +1,4 @@
-@mixin valo-combobox ($primary-stylename: v-filterselect) {
+@mixin valo-combobox ($primary-stylename: v-filterselect, $include-additional-styles: contains($v-included-additional-styles, combobox)) {
.#{$primary-stylename} {
position: relative;
@@ -59,6 +59,35 @@
}
}
+
+ @if $include-additional-styles {
+ .#{$primary-stylename}-borderless {
+ .#{$primary-stylename}-input {
+ @include valo-textfield-borderless-style;
+ }
+ .#{$primary-stylename}-button {
+ border: none;
+ }
+ }
+
+ .#{$primary-stylename}-align-right input {
+ text-align: right;
+ }
+
+ .#{$primary-stylename}-align-center input {
+ text-align: center;
+ }
+
+ .#{$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);
+ 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);
+ font-size: $v-font-size--large;
+ }
+ }
}