diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2013-09-26 12:10:38 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2013-09-26 12:10:38 +0000 |
| commit | 0434d3fcacb01b54b8d579235dbd9859faf6ec08 (patch) | |
| tree | f5d7f91bd8b2f818942d6c98323a2a218f58c983 | |
| parent | d258897b6b0aaaefdae5f3ac757a87089e7b4c7a (diff) | |
| download | vaadin-framework-0434d3fcacb01b54b8d579235dbd9859faf6ec08.tar.gz vaadin-framework-0434d3fcacb01b54b8d579235dbd9859faf6ec08.zip | |
Backported #12295 to Vaadin 6.8 (#12662)
svn changeset:26143/svn branch:6.8
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 4 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 4dbe35704c..3b56827c5e 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -234,7 +234,7 @@ div.v-app-loading { .v-scrollable { overflow: auto; } -/* Enable kinetic scrolling on Mobile Safari 6 */ -.v-ios.v-sa6 .v-scrollable { +/* Enable kinetic scrolling on iOS 6 */ +.v-ios6.v-webkit & .v-scrollable { -webkit-overflow-scrolling: touch; }
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java index 2c09a0b81f..43d7ecd1df 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -172,7 +172,7 @@ public class BrowserInfo { } String osClass = getOperatingSystemClass(); if (osClass != null) { - cssClass = cssClass + " " + prefix + osClass; + cssClass = cssClass + " " + osClass; } if (isTouchDevice()) { cssClass = cssClass + " " + prefix + UI_TOUCH; @@ -183,16 +183,22 @@ public class BrowserInfo { } private String getOperatingSystemClass() { + String prefix = "v-"; + if (browserDetails.isAndroid()) { - return OS_ANDROID; + return prefix + OS_ANDROID; } else if (browserDetails.isIOS()) { - return OS_IOS; + String iosClass = prefix + OS_IOS; + if (isIOS6()) { + iosClass += " " + prefix + OS_IOS + "6"; + } + return iosClass; } else if (browserDetails.isWindows()) { - return OS_WINDOWS; + return prefix + OS_WINDOWS; } else if (browserDetails.isLinux()) { - return OS_LINUX; + return prefix + OS_LINUX; } else if (browserDetails.isMacOSX()) { - return OS_MACOSX; + return prefix + OS_MACOSX; } // Unknown OS return null; |