From a41887756378dc0c16754afd55834f529c474ee0 Mon Sep 17 00:00:00 2001 From: Teppo Kurki Date: Mon, 22 Jun 2015 13:52:34 +0300 Subject: Fixed regression by #15381 on IE8 The opacity for disabled menu items looks very ugly on IE8. Fixed by using the previous gray color for text and opacity filter only for the item icon. Change-Id: If48716cdccef05ebdba43b5600e41c0690398429 --- .../tests/themes/base/DisabledMenuBarItemTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'uitest/src') diff --git a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java index bec28d7929..3a5ddf5f3b 100644 --- a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java +++ b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java @@ -21,19 +21,17 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest { WebElement element = driver.findElement(By .className("v-menubar-menuitem-disabled")); - assertThat(element.getCssValue("opacity"), is("0.5")); - - if (browserIsIE8or9()) { + if (Browser.IE9.getDesiredCapabilities().equals( + getDesiredCapabilities())) { assertThat(element.getCssValue("filter"), is("alpha(opacity=50)")); + } else if (Browser.IE8.getDesiredCapabilities().equals( + getDesiredCapabilities())) { + WebElement icon = element.findElement(By.tagName("img")); + assertThat(icon.getCssValue("filter"), is("alpha(opacity=50)")); + } else { + assertThat(element.getCssValue("opacity"), is("0.5")); } compareScreen("transparent"); } - - private boolean browserIsIE8or9() { - return Browser.IE8.getDesiredCapabilities().equals( - getDesiredCapabilities()) - || Browser.IE9.getDesiredCapabilities().equals( - getDesiredCapabilities()); - } } \ No newline at end of file -- cgit v1.2.3