Преглед на файлове

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

No longer needed as #10384 is fixed

This reverts commit 7dad7d8228.

Change-Id: Id7dbd716144452b80fae07d54f4a61c5091fd83d
tags/7.0.0.beta11
Artur Signell преди 11 години
родител
ревизия
4a7b511488

+ 0
- 10
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;

+ 9
- 0
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;
}

+ 0
- 8
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;

+ 2
- 1
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;

+ 1
- 0
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;

+ 0
- 8
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;

+ 2
- 1
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;

+ 0
- 7
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;

Loading…
Отказ
Запис