8 files changed, 35 insertions, 14 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index a16b063ba8..42047e9af5 100644
--- 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 ac9154d2dc..9162e64a89 100644
--- 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 8a24a73cbf..855c9d19e1 100644
--- 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 050d100673..ab4651033e 100644
--- 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 5e85cb09bc..7de3365717 100644
--- 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 ce6b54610e..880378e34a 100644
--- 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 9d4b4a4858..8a2cdb95bc 100644
--- 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 de4d2b3bbd..a5150b2d16 100644
--- 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;