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/base | |
| 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/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 10 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.scss | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 42047e9af5..a16b063ba8 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -47,16 +47,6 @@ overflow: hidden; } -/* Temporarily moved here to make drag'n'drop work before #10384 is fixed */ -.v-drag-element { - z-index: 60000; - /* override any other position: properties */ - position: absolute !important; - opacity: 0.5; - filter: alpha(opacity=50); - cursor: default; -} - @mixin base { // @include base-app; diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index 9162e64a89..ac9154d2dc 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -204,6 +204,15 @@ body &.v-app-loading { padding: 2px; } +.v-drag-element { + z-index: 60000; + /* override any other position: properties */ + position: absolute !important; + opacity: 0.5; + filter: alpha(opacity=50); + cursor: default; +} + .v-clip { overflow: hidden; } |