aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/reindeer/button/button-standard.scss2
-rw-r--r--WebContent/VAADIN/themes/valo/components/_button.scss2
-rw-r--r--uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java27
-rw-r--r--uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java25
4 files changed, 0 insertions, 56 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
index 4809611442..632340f228 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
+++ b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
@@ -42,8 +42,6 @@
background-repeat: no-repeat;
background-position: right top;
background-image: url(img/right.png); /** sprite-ref: buttons; sprite-alignment: right */
- overflow: hidden;
- text-overflow: ellipsis;
}
.#{$primaryStyleName}-caption {
diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/WebContent/VAADIN/themes/valo/components/_button.scss
index 673a55a97a..3a4bca615d 100644
--- a/WebContent/VAADIN/themes/valo/components/_button.scss
+++ b/WebContent/VAADIN/themes/valo/components/_button.scss
@@ -119,8 +119,6 @@
text-align: center;
white-space: nowrap;
outline: none;
- overflow: hidden;
- text-overflow: ellipsis;
@include valo-tappable;
@if $vertical-centering {
@include valo-button-vertical-centering;
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