diff options
author | Anna Koskinen <anna@vaadin.com> | 2012-11-27 10:33:53 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-12-10 13:11:13 +0000 |
commit | 97834440254dcb03ed267fbf5f453f4dc435a291 (patch) | |
tree | 69ce018cfdec938dcc01d1bf1cfe5dff06bff8f8 /WebContent/VAADIN/themes/runo | |
parent | d2b69dbee663bc2607a9d268e4c751e9dbdc53a5 (diff) | |
download | vaadin-framework-97834440254dcb03ed267fbf5f453f4dc435a291.tar.gz vaadin-framework-97834440254dcb03ed267fbf5f453f4dc435a291.zip |
Vaadin 7 compatible ColorPicker (#9201)
Change-Id: I44962ceedd5ef607e2fbe2af0d96808e0aef9cc5
Diffstat (limited to 'WebContent/VAADIN/themes/runo')
-rw-r--r-- | WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss | 20 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/runo/runo.scss | 4 |
2 files changed, 23 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss b/WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss new file mode 100644 index 0000000000..df48c10a86 --- /dev/null +++ b/WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss @@ -0,0 +1,20 @@ +@mixin runo-colorpicker($name : v-colorpicker) { + +.#{$name}-popup { + width: 248px; +} + +.#{$name}-popup .v-tabsheet .#{$name}-grid { + height: 305px; +} + +.#{$name}-popup .v-tabsheet-deco { + background: none; + height: 0; +} + +.#{$name}-popup .v-filterselect { + padding-right: 25px; +} + +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss index de4d2b3bbd..395f4d0b1b 100644 --- a/WebContent/VAADIN/themes/runo/runo.scss +++ b/WebContent/VAADIN/themes/runo/runo.scss @@ -4,6 +4,7 @@ @import "accordion/accordion.scss"; @import "button/button.scss"; @import "caption/caption.scss"; +@import "colorpicker/colorpicker.scss"; @import "common/common.scss"; @import "datefield/datefield.scss"; @import "inlinedatefield/inlinedatefield.scss"; @@ -39,6 +40,7 @@ @include runo-accordion; @include runo-button; @include runo-caption; + @include runo-colorpicker; @include runo-common; @@ -63,4 +65,4 @@ @include runo-textfield; @include runo-tree; @include runo-window; -}
\ No newline at end of file +} |