diff options
| -rw-r--r-- | WebContent/VAADIN/themes/base/menubar/menubar.scss | 9 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.scss b/WebContent/VAADIN/themes/base/menubar/menubar.scss index 5ffac6de09..ad701f1b42 100644 --- a/WebContent/VAADIN/themes/base/menubar/menubar.scss +++ b/WebContent/VAADIN/themes/base/menubar/menubar.scss @@ -56,7 +56,16 @@ .#{$primaryStyleName} span.#{$primaryStyleName}-menuitem-disabled:active { opacity: .5; filter: alpha(opacity=50); + + .v-ie8 & { + filter: none; + color: #999; + img { + filter: alpha(opacity=50); + } + } } + .#{$primaryStyleName}-more-menuitem { /* Arial has the most coverage for geometric entity characters */ font-family: arial, helvetica, sans-serif; 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 |