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

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index 42047e9af564025bf3b7e350e05083dae01a4491..a16b063ba81a3a1048eb4c58626846294fc84eab 100644 (file)
--- 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 9162e64a891ed64004d93125259e88508985bb32..ac9154d2dc8206009f86e0cca9cd856640a3440a 100644 (file)
--- 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;
 }

diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 855c9d19e1e2211ff7c51d477e9049432df9b17e..8a24a73cbfca782e05f7d2170099bbb13d030048 100644 (file)
--- 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 ab4651033e93444d7ac155c29ea9e06078e932bc..050d10067356f1eddd6053a84ecef33324ed3bd8 100644 (file)
--- 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;

diff --git a/WebContent/VAADIN/themes/reindeer/common/common.scss b/WebContent/VAADIN/themes/reindeer/common/common.scss
index 7de3365717e55a7381348239052454b0d16e4302..5e85cb09bca80e205d51adb7a83f8964e3a79d15 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/common/common.scss
+++ b/WebContent/VAADIN/themes/reindeer/common/common.scss
@@ -25,6 +25,7 @@
 .v-contextmenu,
 .v-Notification,
 .v-menubar-submenu,
+.v-drag-element,
 .v-table-header-drag {
        font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
        font-size: 12px;

diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss
index 880378e34a16714c634f6e4aaf417f24bb06fb71..ce6b54610ed1ffd0d04b67081d4ca9a2e0fdad4e 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -32,14 +32,6 @@
        background: #f5f5f5;
 }
 
-/* Temporarily moved here to make drag'n'drop work before #10384 is fixed */
-.v-drag-element {
-        font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
-        font-size: 12px;
-        line-height: normal;
-        color: #222;
-}
-
 @mixin reindeer {
        // should this be here?
        @include base;

diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/WebContent/VAADIN/themes/runo/common/common.scss
index 8a2cdb95bc3b23c5c5db48ccb903b75c9c9bf08c..9d4b4a4858665f294c93f2357d2b2c1c97a92e39 100644 (file)
--- 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 a5150b2d16c95e030e616a42adf4d41e801f9c40..de4d2b3bbdd23e2705d87686f3af6af1d51ca1f8 100644 (file)
--- 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;