summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/reindeer
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-12-02 13:11:42 +0200
committerArtur Signell <artur@vaadin.com>2012-12-02 15:17:18 +0200
commit4a7b511488af4d0b0435650105b3352bf2a3f63f (patch)
treec21d0c0dd1fd209d2610f6ef094f1dc9da73c6f0 /WebContent/VAADIN/themes/reindeer
parent2ba840711a1f482c48c4c97879123fecf988faba (diff)
downloadvaadin-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/reindeer')
-rw-r--r--WebContent/VAADIN/themes/reindeer/common/common.scss1
-rw-r--r--WebContent/VAADIN/themes/reindeer/reindeer.scss8
2 files changed, 1 insertions, 8 deletions
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;