diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-04-15 10:24:44 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-04-15 10:24:44 +0300 |
| commit | 2c4e533c9f2aa68211329ea6ce4de0b577407863 (patch) | |
| tree | 1d9c1cc8bb72678b0edb991947c6fc94112baf0f /WebContent | |
| parent | 93235f05c9dd4739cdccf87a4858a61904dbf4b5 (diff) | |
| parent | 7cb23bc63f794a7549dd79c37da2f8bb8e88e20d (diff) | |
| download | vaadin-framework-2c4e533c9f2aa68211329ea6ce4de0b577407863.tar.gz vaadin-framework-2c4e533c9f2aa68211329ea6ce4de0b577407863.zip | |
Merge remote-tracking branch 'origin/master' into grid-7.5
Change-Id: I03fdd2014fd0393341db0f650c065f6d27905b73
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/components/_colorpicker.scss | 2 |
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 { |