From 3f1a8b7709b289897f76153d4877867bc073a0b7 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 7 Jan 2013 20:18:46 +0200 Subject: Reset line-height in layouts the same way as for v-scrollable (#10598) Change-Id: Iee684359f8d2ca6d06fe3014ab32d74cce3e7f73 --- WebContent/VAADIN/themes/base/layout/layout.scss | 1 + .../tabsheet/EXtraScrollbarsInTabSheet.html | 27 ++++++++++++++ .../tabsheet/ExtraScrollbarsInTabSheet.java | 41 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100755 uitest/src/com/vaadin/tests/components/tabsheet/EXtraScrollbarsInTabSheet.html create mode 100755 uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java 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 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.tabsheet.ExtraScrollbarsInTabSheet?restartApplication
screenCaptureno-scrollbars
+ + 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); + + } + +} -- cgit v1.2.3