summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss3
-rw-r--r--WebContent/VAADIN/themes/valo/components/_colorpicker.scss2
2 files changed, 4 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss b/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss
index b2558d8df3..70705dcee3 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss
+++ b/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss
@@ -18,6 +18,9 @@
margin: 1px auto;
}
+.#{$name}.v-default-caption-width {
+ width: 100px;
+}
/***************** COLOR HISTORY COMPONENT *****************************/
.#{$name}-history {
diff --git a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
index b859904e59..18f92500dc 100644
--- a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
+++ b/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
@@ -198,7 +198,7 @@
}
.#{$primary-stylename} {
- width: auto !important;
+ width: auto;
}
.#{$primary-stylename}-button-color {