diff options
| author | Artur Signell <artur@vaadin.com> | 2012-12-02 13:11:42 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-12-02 15:17:18 +0200 |
| commit | 4a7b511488af4d0b0435650105b3352bf2a3f63f (patch) | |
| tree | c21d0c0dd1fd209d2610f6ef094f1dc9da73c6f0 /WebContent/VAADIN/themes/chameleon | |
| parent | 2ba840711a1f482c48c4c97879123fecf988faba (diff) | |
| download | vaadin-framework-4a7b511488af4d0b0435650105b3352bf2a3f63f.tar.gz vaadin-framework-4a7b511488af4d0b0435650105b3352bf2a3f63f.zip | |
Revert "Temporary work around for drag'n'drop image problem (#10385)"
No longer needed as #10384 is fixed
This reverts commit 7dad7d82287bc9906ef12d1efd64f8b1da3a0326.
Change-Id: Id7dbd716144452b80fae07d54f4a61c5091fd83d
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, 2 insertions, 9 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss index 855c9d19e1..8a24a73cbf 100644 --- a/WebContent/VAADIN/themes/chameleon/chameleon.scss +++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss @@ -3,14 +3,6 @@ @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 ab4651033e..050d100673 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.scss +++ b/WebContent/VAADIN/themes/chameleon/common/common.scss @@ -70,7 +70,8 @@ $chameleon-line-height: 1.4; .v-Notification, .v-menubar-submenu, .v-table-header-drag, - .v-menubar-submenu { + .v-menubar-submenu, + .v-drag-element { font-family: $chameleon-font-family; font-size: $chameleon-font-size; line-height: $chameleon-line-height; |