summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-06-19 14:48:49 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-06-19 14:48:49 +0300
commita821f9fdd5b853409c7f7c3a22eba0733e2900c6 (patch)
tree94afcb8342d1e7174741e90fa0bd20c0b0d51bfc /WebContent
parentd3a13928a8f856ae3bff668db7f13d6f60f7a358 (diff)
parent1401003a10eb328995b92351e9f716fce705dfc8 (diff)
downloadvaadin-framework-a821f9fdd5b853409c7f7c3a22eba0733e2900c6.tar.gz
vaadin-framework-a821f9fdd5b853409c7f7c3a22eba0733e2900c6.zip
Merge branch '6.8'
Conflicts: src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java src/com/vaadin/terminal/gwt/client/ui/form/VForm.java src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java tests/server-side/com/vaadin/tests/VaadinClasses.java Removed Java5-incompatible @Override annotations
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/common/common.css9
1 files changed, 5 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index b3bf6084be..d2695a8015 100644
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -235,10 +235,11 @@ div.v-app-loading {
.v-drag-element {
z-index: 60000;
- position: absolute;
- opacity: 0.5;
- filter: alpha(opacity=50);
- cursor: default;
+ /* override any other position: properties */
+ position: absolute !important;
+ opacity: 0.5;
+ filter: alpha(opacity=50);
+ cursor: default;
}
.v-clip {