summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/base/layout/layout.scss1
-rwxr-xr-xuitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html27
-rwxr-xr-xuitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java41
3 files changed, 69 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index e085abcc60..d49b2ad0dd 100644
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -37,6 +37,7 @@ TODO
.v-verticallayout,
.v-horizontallayout {
font-size: 0;
+ line-height: normal;
}
.v-gridlayout.v-layout-margin-bottom {
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html b/uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html
new file mode 100755
index 0000000000..4287eaa05b
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.ExtraScrollbarsInTabSheet?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>no-scrollbars</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java b/uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
new file mode 100755
index 0000000000..2917eccbfb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
@@ -0,0 +1,41 @@
+package com.vaadin.tests.components.tabsheet;
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.HorizontalSplitPanel;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.themes.Runo;
+
+@Theme("runo")
+public class ExtraScrollbarsInTabSheet extends UI {
+
+ @Override
+ public void init(VaadinRequest request) {
+
+ VerticalLayout vl = new VerticalLayout();
+ vl.setSizeFull();
+
+ HorizontalSplitPanel horizontalSplit = new HorizontalSplitPanel();
+
+ TabSheet ts = new TabSheet();
+
+ VerticalLayout tabContent = new VerticalLayout();
+ tabContent.setSizeFull();
+
+ Panel p = new Panel();
+ p.addStyleName(Runo.PANEL_LIGHT);
+ p.setHeight("400px");
+ tabContent.addComponent(p);
+
+ ts.addTab(tabContent);
+ horizontalSplit.setSecondComponent(ts);
+
+ vl.addComponent(horizontalSplit);
+
+ setContent(vl);
+
+ }
+
+}