diff options
author | Artur Signell <artur@vaadin.com> | 2013-08-19 17:31:46 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-08-19 17:31:46 +0300 |
commit | 633e0201cd2a79893d043c77b15062342cfe46e0 (patch) | |
tree | 19fafa44c16a391e182413609b8ba7cb1f568eab /WebContent/VAADIN | |
parent | 7ca0ced36217a0783b25c59b58ba31fd5dae1e28 (diff) | |
parent | 8ba41172216a98a45f82319d9a98d04a26efa52a (diff) | |
download | vaadin-framework-633e0201cd2a79893d043c77b15062342cfe46e0.tar.gz vaadin-framework-633e0201cd2a79893d043c77b15062342cfe46e0.zip |
Merge changes from origin/7.1
16d17f9 Fix native scrolling regression in iOS 6 homescreen apps (#12295)
7212e02 Fix race in VaadinService.lockSession() (#12282)
2d5a107 Update "lastRequestedFirstvisible" field value right away (#10666).
325cdf9 Disable failing calendar Actions Menu Test (#12181)
8ba4117 Split UiAccess test (#12332)
Change-Id: I30e7aaacaf0ecbdc1a6dbdf956a6e48f4846de32
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r-- | WebContent/VAADIN/themes/base/common/common.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss index c32116cda8..cb3645c9d8 100644 --- a/WebContent/VAADIN/themes/base/common/common.scss +++ b/WebContent/VAADIN/themes/base/common/common.scss @@ -228,8 +228,8 @@ input::-ms-clear { line-height: normal; } -/* 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; } |