From cdb9a49bd542fe28ed29c52b90ee9875e2556f67 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Tue, 10 Sep 2013 15:36:51 +0300 Subject: Enable native scrolling in all iOS versions newer than 5, not just iOS 6 (#12324) Change-Id: I8f9ec7f34aefa5b48fd23f3f000f9455475edefa --- WebContent/VAADIN/themes/base/common/common.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'WebContent/VAADIN') 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; -- cgit v1.2.3