From 503e317290f016bb15a275780e48c513e4589495 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 15 Mar 2012 15:30:31 +0200
Subject: Increase paddings to work in all browsers

---
 .../com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/testbench')

diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 252e8ba82c..9fe6367d60 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -456,7 +456,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         vlo2.addComponent(c1);
         // Must add something around the hr to avoid the margins collapsing
         vlo2.addComponent(new Label(
-                "<div style='height: 0.01px'></div><hr /><div style='height: 0.01px'></div>",
+                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
                 ContentMode.XHTML));
         vlo2.addComponent(c2);
         vlo2.setExpandRatio(c1, 0.5f);
-- 
cgit v1.2.3


From 2dd0568f5bdd42c6385d80745e8e5680527d1223 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 15 Mar 2012 16:59:53 +0200
Subject: Prevent another case of margin collapse

---
 .../com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/testbench')

diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 9fe6367d60..fee1807c09 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -269,7 +269,9 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         button4.setEnabled(false);
 
         vlo2.addComponent(c1);
-        vlo2.addComponent(new Label("<hr />", ContentMode.XHTML));
+        vlo2.addComponent(new Label(
+                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
+                ContentMode.XHTML));
         vlo2.addComponent(c2);
         vlo2.setExpandRatio(c1, 0.5f);
         vlo2.setExpandRatio(c2, 0.5f);
-- 
cgit v1.2.3