Pārlūkot izejas kodu

Revert "Hide button caption overflow in reindeer and valo. (#11864)"

This reverts commit c9586c93b9.

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
tags/7.5.0.alpha1
Jouni Koivuviita pirms 9 gadiem
vecāks
revīzija
0d59ce144c

+ 0
- 2
WebContent/VAADIN/themes/reindeer/button/button-standard.scss Parādīt failu

@@ -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 {

+ 0
- 2
WebContent/VAADIN/themes/valo/components/_button.scss Parādīt failu

@@ -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;

+ 0
- 27
uitest/src/com/vaadin/tests/themes/ButtonTextOverflow.java Parādīt failu

@@ -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;
}
}

+ 0
- 25
uitest/src/com/vaadin/tests/themes/ButtonTextOverflowTest.java Parādīt failu

@@ -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");
}

}

Notiek ielāde…
Atcelt
Saglabāt