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/runo | |
| 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/runo')
| -rw-r--r-- | WebContent/VAADIN/themes/runo/common/common.scss | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/runo.scss | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss index 8a2cdb95bc..9d4b4a4858 100644 --- a/WebContent/VAADIN/themes/runo/common/common.scss +++ b/WebContent/VAADIN/themes/runo/common/common.scss @@ -28,7 +28,8 @@ .v-datefield-popup, .v-contextmenu, .v-Notification, -.v-menubar-submenu { +.v-menubar-submenu, +.v-drag-element { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; color: #464f52; font-size: 13px; diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss index a5150b2d16..de4d2b3bbd 100644 --- a/WebContent/VAADIN/themes/runo/runo.scss +++ b/WebContent/VAADIN/themes/runo/runo.scss @@ -31,13 +31,6 @@ background: #e9eced; } -/* Temporarily moved here to make drag'n'drop work before #10384 is fixed */ -.v-drag-element { - font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; - color: #464f52; - font-size: 13px; -} - @mixin runo { // TODO move? @include base; |