aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/reindeer
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-26 23:31:13 +0200
committerArtur Signell <artur@vaadin.com>2012-11-26 23:31:39 +0200
commit7dad7d82287bc9906ef12d1efd64f8b1da3a0326 (patch)
tree4c2e60f960b036a60b1ae8615184bbc78cd88256 /WebContent/VAADIN/themes/reindeer
parent57ad5b2fbe98af98b48f3f82ef19a2656cf5328e (diff)
downloadvaadin-framework-7dad7d82287bc9906ef12d1efd64f8b1da3a0326.tar.gz
vaadin-framework-7dad7d82287bc9906ef12d1efd64f8b1da3a0326.zip
Temporary work around for drag'n'drop image problem (#10385)
Change-Id: If3b0709feb638f0116273f35a61708b5c4130ac0
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, 8 insertions, 1 deletions
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;