2 files changed, 17 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss b/WebContent/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
new file mode 100644
index 0000000000..98f00f0626
--- /dev/null
+++ b/WebContent/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
@@ -0,0 +1,15 @@
+@mixin chameleon-colorpicker($name : v-colorpicker) {
+
+.#{$name}-button-color {
+	border: 1px solid #8B8B8B;
+}
+
+.#{$name}-popup {
+	width: 248px;
+}
+
+.#{$name}-popup .v-tabsheet .#{$name}-grid {
+	height: 308px;
+}
+
+}
+\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/components.scss b/WebContent/VAADIN/themes/chameleon/components/components.scss
index 79b5a2d468..9f29827de0 100644
--- a/WebContent/VAADIN/themes/chameleon/components/components.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/components.scss
@@ -1,5 +1,6 @@
 @import "accordion/accordion.scss";
 @import "button/button.scss";
+@import "colorpicker/colorpicker.scss";
 @import "label/label.scss";
 @import "menubar/menubar.scss";
 @import "notification/notification.scss";
@@ -22,6 +23,7 @@
 
 	@include chameleon-accordion;
 	@include chameleon-button;
+	@include chameleon-colorpicker;
 	@include chameleon-label;
 	@include chameleon-menubar;
 	@include chameleon-notification;