diff options
-rw-r--r-- | WebContent/VAADIN/themes/base/browserframe/browserframe.scss | 7 | ||||
-rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_global.scss | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss index 149e38a744..fce9c11513 100644 --- a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss +++ b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss @@ -4,6 +4,13 @@ .v-browserframe { font-size: 0; } + + /* fix for #14813 - unable to scroll on iOS devices */ + .v-webkit.v-ios & .v-browserframe { + -webkit-overflow-scrolling: touch; + overflow:auto; + } + /* Some times a browser frame can contain a span with altenate text */ .v-browserframe > span { font-size: $font-size; diff --git a/WebContent/VAADIN/themes/valo/shared/_global.scss b/WebContent/VAADIN/themes/valo/shared/_global.scss index 049518af73..4ce294b06a 100644 --- a/WebContent/VAADIN/themes/valo/shared/_global.scss +++ b/WebContent/VAADIN/themes/valo/shared/_global.scss @@ -121,6 +121,12 @@ $valo-global-included: false !default; -webkit-overflow-scrolling: none; } + //fix for #14813 - unable to scroll on iOS devices + .v-webkit.v-ios .v-browserframe { + -webkit-overflow-scrolling: touch; + overflow:auto; + } + .v-assistive-device-only { position: absolute; top: -2000px; |