From c49adbc8cf61f1126986b26f54e05cb97509fd3a Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 18 Aug 2011 14:08:08 +0000 Subject: [PATCH] Added some ugly styles so that the feature can be visually verified svn changeset:20478/svn branch:6.7 --- .../VAADIN/themes/tests-tickets/styles.css | 23 +++++++++++++++++++ .../tabsheet/TabSheetTabStyleNames.html | 6 ++--- .../tabsheet/TabSheetTabStyleNames.java | 4 +++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css index e6001a6dc2..f088e0dd35 100644 --- a/WebContent/VAADIN/themes/tests-tickets/styles.css +++ b/WebContent/VAADIN/themes/tests-tickets/styles.css @@ -335,4 +335,27 @@ .v-tabsheet-pg .v-tabsheet-tabitem-selected { font-weight: bold +} + +.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-tabsheet-tabitem-selected .v-caption { + background-color: green; +} + +.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-caption { + font-weight: bold; + background: none; + margin-left: 0px; + background-color: blue; +} +.v-tabsheet-tabitemcell-TabSheetTabStyleNames_0 .v-caption { + color: blue; +} + +.v-tabsheet-tabitemcell-TabSheetTabStyleNames_1 .v-caption { + color: red; +} + +.v-tabsheet-tabitemcell-TabSheetTabStyleNames .v-tabsheet-tabitem { + background: none; + border: 2px solid red; } \ No newline at end of file diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html index 0ff83bbaca..67bedd93a3 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html @@ -19,7 +19,7 @@ assertCSSClass vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0] - v-tabsheet-tabitemcell-ticket5880 + v-tabsheet-tabitemcell-TabSheetTabStyleNames click @@ -29,12 +29,12 @@ assertNotCSSClass vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0] - v-tabsheet-tabitemcell-ticket5880 + v-tabsheet-tabitemcell-TabSheetTabStyleNames assertCSSClass vaadin=runcomvaadintestscomponentstabsheetTabSheetTabStyleNames::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1] - v-tabsheet-tabitemcell-ticket5880_0 + v-tabsheet-tabitemcell-TabSheetTabStyleNames_0 diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java index 00b6e142b3..5c806b2ac2 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java @@ -9,10 +9,12 @@ import com.vaadin.ui.TabSheet.Tab; public class TabSheetTabStyleNames extends TestBase { - private static final String STYLE_NAME = "ticket5880"; + private static final String STYLE_NAME = "TabSheetTabStyleNames"; @Override public void setup() { + setTheme("tests-tickets"); + TabSheet tabsheet = new TabSheet(); final Tab tab1 = tabsheet.addTab(new Label(), "Tab 1"); final Tab tab2 = tabsheet.addTab(new Label(), "Tab 2"); -- 2.39.5