From: Johannes Dahlström <johannesd@vaadin.com>
Date: Mon, 11 Jun 2012 08:48:53 +0000 (+0300)
Subject: Merge commit '63dc0'
X-Git-Tag: 7.0.0.alpha3~189
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb02748020af87eb4b322d77ad6ea18efa7f049a;p=vaadin-framework.git

Merge commit '63dc0'

Conflicts:
	WebContent/VAADIN/themes/base/common/common.css
---

bb02748020af87eb4b322d77ad6ea18efa7f049a
diff --cc WebContent/VAADIN/themes/base/common/common.css
index 3c08a9d584,adf84ac3b7..222ec5912f
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@@ -242,6 -231,7 +242,11 @@@ div.v-app-loading 
      cursor: default;
  }
  
 +.v-clip {
 +	overflow: hidden;
- }
++}
++
+ .v-scrollable {
+ 	overflow: auto;
+ 	-webkit-overflow-scrolling: touch;
 -}
++}