aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/base.scss
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2012-11-27 10:33:53 +0200
committerVaadin Code Review <review@vaadin.com>2012-12-10 13:11:13 +0000
commit97834440254dcb03ed267fbf5f453f4dc435a291 (patch)
tree69ce018cfdec938dcc01d1bf1cfe5dff06bff8f8 /WebContent/VAADIN/themes/base/base.scss
parentd2b69dbee663bc2607a9d268e4c751e9dbdc53a5 (diff)
downloadvaadin-framework-97834440254dcb03ed267fbf5f453f4dc435a291.tar.gz
vaadin-framework-97834440254dcb03ed267fbf5f453f4dc435a291.zip
Vaadin 7 compatible ColorPicker (#9201)
Change-Id: I44962ceedd5ef607e2fbe2af0d96808e0aef9cc5
Diffstat (limited to 'WebContent/VAADIN/themes/base/base.scss')
-rw-r--r--WebContent/VAADIN/themes/base/base.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index a16b063ba8..640978d316 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -5,6 +5,7 @@
@import "button/checkbox.scss";
@import "layout/layout.scss";
@import "caption/caption.scss";
+@import "colorpicker/colorpicker.scss";
@import "common/common.scss";
@import "csslayout/csslayout.scss";
@import "customcomponent/customcomponent.scss";
@@ -61,6 +62,7 @@
@include base-nativebutton;
@include base-checkbox;
@include base-caption;
+ @include base-colorpicker;
// here for now to preserve old semantics
@include base-common;