aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-11-30 09:50:44 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-30 09:50:44 +0000
commit93f932e52558dd933aaa7a8c8b60c8306b0cc189 (patch)
tree14b7c598070c576fe1de7c8c0af1abe2ac63e328
parent48f08b24c397e0dd5a7894584a10b8f44b5f1011 (diff)
parent5d0001b1c75968abf4de10aa35d7a4cc464999ff (diff)
downloadvaadin-framework-93f932e52558dd933aaa7a8c8b60c8306b0cc189.tar.gz
vaadin-framework-93f932e52558dd933aaa7a8c8b60c8306b0cc189.zip
Merge "Added selector to ensure styles apply (test fix only)"
-rw-r--r--uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
index 22ed5e5a4a..f0010acce8 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
@@ -20,10 +20,10 @@ import com.vaadin.ui.VerticalLayout;
public class DragAndDropWrapperTooltips extends TestBase {
- private final String BASE = ".greenblock {vertical-align: middle; float:left; width:60px;height:60px;background: green !important; padding:0; margin:2px;-webkit-transition: width 0.3s ease-in-out;color: white;}";
- private final String B2 = ".b2 {background-color: red !important;}";
- private final String B3 = ".b3 {background-color: yellow !important;color: black;}";
- private final String B4 = ".b4 {background-color: blue !important;}";
+ private final String BASE = ".v-widget.greenblock {vertical-align: middle; float:left; width:60px;height:60px;background: green !important; padding:0; margin:2px;-webkit-transition: width 0.3s ease-in-out;color: white;}";
+ private final String B2 = ".v-widget.b2 {background-color: red !important;}";
+ private final String B3 = ".v-widget.b3 {background-color: yellow !important;color: black;}";
+ private final String B4 = ".v-widget.b4 {background-color: blue !important;}";
private final String HIDEDRAGSOURCE = ".v-active-drag-source { overflow:hidden; width:0px !important;}";
private DragAndDropWrapper dragAndDropWrapper;