Temporary work around for drag'n'drop image problem (#10385)

Change-Id: If3b0709feb638f0116273f35a61708b5c4130ac0

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index a16b063ba81a3a1048eb4c58626846294fc84eab..42047e9af564025bf3b7e350e05083dae01a4491 100644 (file)
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -47,6 +47,16 @@
        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 ac9154d2dc8206009f86e0cca9cd856640a3440a..9162e64a891ed64004d93125259e88508985bb32 100644 (file)
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -204,15 +204,6 @@ 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 8a24a73cbfca782e05f7d2170099bbb13d030048..855c9d19e1e2211ff7c51d477e9049432df9b17e 100644 (file)
--- 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 050d10067356f1eddd6053a84ecef33324ed3bd8..ab4651033e93444d7ac155c29ea9e06078e932bc 100644 (file)
--- 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;

diff --git a/WebContent/VAADIN/themes/reindeer/common/common.scss b/WebContent/VAADIN/themes/reindeer/common/common.scss
index 5e85cb09bca80e205d51adb7a83f8964e3a79d15..7de3365717e55a7381348239052454b0d16e4302 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/common/common.scss
+++ b/WebContent/VAADIN/themes/reindeer/common/common.scss
@@ -25,7 +25,6 @@
 .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 ce6b54610ed1ffd0d04b67081d4ca9a2e0fdad4e..880378e34a16714c634f6e4aaf417f24bb06fb71 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss
@@ -32,6 +32,14 @@
        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 9d4b4a4858665f294c93f2357d2b2c1c97a92e39..8a2cdb95bc3b23c5c5db48ccb903b75c9c9bf08c 100644 (file)
--- a/WebContent/VAADIN/themes/runo/common/common.scss
+++ b/WebContent/VAADIN/themes/runo/common/common.scss
@@ -28,8 +28,7 @@
 .v-datefield-popup,
 .v-contextmenu,
 .v-Notification,
-.v-menubar-submenu,
-.v-drag-element {
+.v-menubar-submenu {
        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 de4d2b3bbdd23e2705d87686f3af6af1d51ca1f8..a5150b2d16c95e030e616a42adf4d41e801f9c40 100644 (file)
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/WebContent/VAADIN/themes/runo/runo.scss
@@ -31,6 +31,13 @@
        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;