2 files changed, 21 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/liferay/colorpicker/colorpicker.scss b/WebContent/VAADIN/themes/liferay/colorpicker/colorpicker.scss
new file mode 100644
index 0000000000..fc50297388
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/colorpicker/colorpicker.scss
@@ -0,0 +1,19 @@
+@mixin liferay-colorpicker($name : v-colorpicker) {
+
+.#{$name}-button-color {
+	border: 1px solid #999999;
+}
+
+.#{$name}-popup {
+	width: 252px;
+}
+
+.#{$name}-popup .v-tabsheet .#{$name}-grid {
+	height: 312px;
+}
+
+.#{$name}-popup .v-filterselect {
+	padding-right: 24px;
+}
+
+}
+\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
index 3128e48c76..299542fea0 100644
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -2,6 +2,7 @@
 
 @import "accordion/accordion.scss";
 @import "button/button.scss";
+@import "colorpicker/colorpicker.scss";
 
 @import "common/common.scss";
 
@@ -29,6 +30,7 @@
 	// TODO @each
 	@include liferay-accordion;
 	@include liferay-button;
+	@include liferay-colorpicker;
 	
 	@include liferay-common;
 	@include liferay-contextmenu;