diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 11:48:53 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 11:48:53 +0300 |
| commit | bb02748020af87eb4b322d77ad6ea18efa7f049a (patch) | |
| tree | cbaa14d02433a502c2588f908eed95d104367754 /WebContent | |
| parent | 8fcb17519486c4629d90df4bc8f8db12a3d7a3ba (diff) | |
| parent | 63dc030e321b05faf02248ca266a90dec2aff067 (diff) | |
| download | vaadin-framework-bb02748020af87eb4b322d77ad6ea18efa7f049a.tar.gz vaadin-framework-bb02748020af87eb4b322d77ad6ea18efa7f049a.zip | |
Merge commit '63dc0'
Conflicts:
WebContent/VAADIN/themes/base/common/common.css
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 3c08a9d584..222ec5912f 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -244,4 +244,9 @@ div.v-app-loading { .v-clip { overflow: hidden; -}
\ No newline at end of file +} + +.v-scrollable { + overflow: auto; + -webkit-overflow-scrolling: touch; +} |