diff options
| author | John Ahlroos <john@vaadin.com> | 2013-11-20 14:26:40 +0200 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2013-11-20 14:27:09 +0200 |
| commit | e3b1e6be389cbe48d1782723adf1595edbd10ea2 (patch) | |
| tree | 61dbd2fac407f0b6657863d100d6b1f09e67e356 /WebContent/VAADIN/themes/base | |
| parent | 96de019ea4ee5536dab87d1f04d4cb94ae71371d (diff) | |
| parent | dd7e6fee8c4717df59699f04f7e72a6f2e92008f (diff) | |
| download | vaadin-framework-e3b1e6be389cbe48d1782723adf1595edbd10ea2.tar.gz vaadin-framework-e3b1e6be389cbe48d1782723adf1595edbd10ea2.zip | |
Merge branch 'master' into grid
Change-Id: I9f669ec38c39a42d1ef2a25121b77aab31551863
Diffstat (limited to 'WebContent/VAADIN/themes/base')
4 files changed, 14 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index 2ea70036c4..5f33d8116f 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -40,6 +40,7 @@ @import "widget/widget.scss"; @import "window/window.scss"; @import "debug/debug.scss"; +@import "browserframe/browserframe.scss"; .v-vaadin-version:after { content: "@version@"; @@ -65,6 +66,7 @@ $line-height: normal; @include base-absolutelayout; @include base-accordion; + @include base-browserframe; @include base-button; @include base-nativebutton; @include base-checkbox; diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss new file mode 100644 index 0000000000..aa4225cf00 --- /dev/null +++ b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss @@ -0,0 +1,7 @@ +@mixin base-browserframe { + + /* Removes duplicate scrollbars in some cases */ + .v-browserframe { + font-size: 0; + } +}
\ No newline at end of file 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; diff --git a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss index 461e1b1246..d672254a86 100644 --- a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss +++ b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss @@ -1,7 +1,6 @@ @mixin base-customcomponent($primaryStyleName : v-customcomponent) { .#{$primaryStyleName} { - overflow: hidden; } }
\ No newline at end of file |