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

8 files changed, 14 insertions, 35 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;
 }
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss
index 855c9d19e1..8a24a73cbf 100644
--- 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 ab4651033e..050d100673 100644
--- 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 7de3365717..5e85cb09bc 100644
--- 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 880378e34a..ce6b54610e 100644
--- 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 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;