aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss
index 207660c08e..e644c9805e 100644
--- a/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss
@@ -84,7 +84,7 @@
margin: 1px 0 4px 0;
}
.v-contextmenu {
- background: #e9eced url(../tabsheet/img/tab-bg.png);
+ background: #e9eced url(../tabsheet/img/tab-bg.png) content-box;
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
background-color: #f6f7f7;
color: #464f52;
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 5974dac6d7..ddc07aa315 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -40,7 +40,7 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
// Chrome version does not necessarily match the desired version
// because of auto updates...
browserIdentifier = getExpectedUserAgentString(
- getDesiredCapabilities()) + "54";
+ getDesiredCapabilities()) + "55";
} else {
browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
+ desiredCapabilities.getVersion();