summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2013-09-10 15:36:51 +0300
committerVaadin Code Review <review@vaadin.com>2013-09-18 15:20:44 +0000
commitcdb9a49bd542fe28ed29c52b90ee9875e2556f67 (patch)
tree1c98b90aded3fb28d829228395da78e416380117 /WebContent
parentd6954f86e401566456a64418ae80e2f8853a5e43 (diff)
downloadvaadin-framework-cdb9a49bd542fe28ed29c52b90ee9875e2556f67.tar.gz
vaadin-framework-cdb9a49bd542fe28ed29c52b90ee9875e2556f67.zip
Enable native scrolling in all iOS versions newer than 5, not just iOS 6 (#12324)
Change-Id: I8f9ec7f34aefa5b48fd23f3f000f9455475edefa
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/common/common.scss8
1 files changed, 5 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index cb3645c9d8..07e244a76f 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -227,11 +227,13 @@ input::-ms-clear {
font-size: 0;
line-height: normal;
}
-
-/* Enable kinetic scrolling on iOS 6 */
-.v-ios6.v-webkit & .v-scrollable {
+.v-ios.v-webkit & .v-scrollable {
-webkit-overflow-scrolling: touch;
}
+/* Disable native scrolling on iOS 5 due to #8792 */
+.v-ios5.v-webkit & .v-scrollable {
+ -webkit-overflow-scrolling: none;
+}
&.v-overlay-container {
width: 0;