From 0d59ce144c6d6e97e45004da849ca4a55fac4883 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 3 Mar 2015 07:47:59 +0000 Subject: Revert "Hide button caption overflow in reindeer and valo. (#11864)" This reverts commit c9586c93b93987d9b5942c38ef0b536c091092a5. This fix will break button focus outline in Valo. The overflow hidden needs to be placed on the inner element (v-button-wrap). For Reindeer the fix is okay, but for consistency it might make sense to move it there to the inner element also. Change-Id: I6cac9fc6a1c8ae6be9969b8dc8533b9cad118d6a --- .../vaadin/tests/themes/ButtonTextOverflow.java | 27 ---------------------- .../tests/themes/ButtonTextOverflowTest.java | 25 -------------------- 2 files changed, 52 deletions(-) delete mode 100644 uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java delete mode 100644 uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java (limited to 'uitest/src/com') diff --git a/uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java b/uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java deleted file mode 100644 index 6cf8b7958e..0000000000 --- a/uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.vaadin.tests.themes; - -import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.Button; - -public class ButtonTextOverflow extends AbstractTestUI { - - @Override - protected void setup(VaadinRequest request) { - Button button = new Button("Button Button Button"); - - button.setWidth("100px"); - - addComponent(button); - } - - @Override - protected String getTestDescription() { - return "Overflowing button caption should be hidden with ellipsis."; - } - - @Override - protected Integer getTicketNumber() { - return 11864; - } -} diff --git a/uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java b/uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java deleted file mode 100644 index e31e98ac6e..0000000000 --- a/uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.vaadin.tests.themes; - -import java.io.IOException; - -import org.junit.Test; - -import com.vaadin.tests.tb3.MultiBrowserTest; - -public class ButtonTextOverflowTest extends MultiBrowserTest { - - @Test - public void captionOverflowIsHiddenInReindeer() throws IOException { - openTestURL("theme=reindeer"); - - compareScreen("reindeer"); - } - - @Test - public void captionOverflowIsHiddenInValo() throws IOException { - openTestURL("theme=valo"); - - compareScreen("valo"); - } - -} \ No newline at end of file -- cgit v1.2.3