diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-26 23:31:13 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-11-26 23:31:39 +0200 |
| commit | 7dad7d82287bc9906ef12d1efd64f8b1da3a0326 (patch) | |
| tree | 4c2e60f960b036a60b1ae8615184bbc78cd88256 /WebContent/VAADIN/themes/chameleon | |
| parent | 57ad5b2fbe98af98b48f3f82ef19a2656cf5328e (diff) | |
| download | vaadin-framework-7dad7d82287bc9906ef12d1efd64f8b1da3a0326.tar.gz vaadin-framework-7dad7d82287bc9906ef12d1efd64f8b1da3a0326.zip | |
Temporary work around for drag'n'drop image problem (#10385)
Change-Id: If3b0709feb638f0116273f35a61708b5c4130ac0
Diffstat (limited to 'WebContent/VAADIN/themes/chameleon')
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/chameleon.scss | 8 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/chameleon/common/common.scss | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss index 8a24a73cbf..855c9d19e1 100644 --- a/WebContent/VAADIN/themes/chameleon/chameleon.scss +++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss @@ -3,6 +3,14 @@ @import "components/components.scss"; @import "compound/compound.scss"; +/* Temporarily moved here to make drag'n'drop work before #10384 is fixed */ +.v-drag-element { + font-family: $chameleon-font-family; + font-size: $chameleon-font-size; + line-height: $chameleon-line-height; + color: #222; +} + @mixin chameleon { // TODO move this? @include base; diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/WebContent/VAADIN/themes/chameleon/common/common.scss index 050d100673..ab4651033e 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.scss +++ b/WebContent/VAADIN/themes/chameleon/common/common.scss @@ -70,8 +70,7 @@ $chameleon-line-height: 1.4; .v-Notification, .v-menubar-submenu, .v-table-header-drag, - .v-menubar-submenu, - .v-drag-element { + .v-menubar-submenu { font-family: $chameleon-font-family; font-size: $chameleon-font-size; line-height: $chameleon-line-height; |