diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2015-03-03 07:47:59 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2015-03-03 07:49:54 +0000 |
commit | 0d59ce144c6d6e97e45004da849ca4a55fac4883 (patch) | |
tree | d20247195244e3704094e4b95010c8a8f4aa8f02 /uitest | |
parent | 2f9dfccb595a68609405ba822f346e41285c9458 (diff) | |
download | vaadin-framework-0d59ce144c6d6e97e45004da849ca4a55fac4883.tar.gz vaadin-framework-0d59ce144c6d6e97e45004da849ca4a55fac4883.zip |
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
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java | 27 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java | 25 |
2 files changed, 0 insertions, 52 deletions
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 |