Merge branch 'bugfix-scrolling-on-touch-devices'

Conflicts: CHANGELOG.md
drublic · Jun 6, 2014 · 1074efa · 1074efa
2 parents d5dae8e + 5f51571
commit 1074efa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
 ## HEAD
+* Fix position of close button on small screens
 * Check if activeElement is available in max-width
 
 ## 1.1.5 - 05.06.2014
-* Fix position of close button on small screens
+* Fix scrolling on touch devices
 
 ## 1.1.4 - 05.06.2014
 * Fix max-width plugin to work on all sizes and listen to resize

diff --git a/_modal-core.scss b/_modal-core.scss
@@ -117,6 +117,7 @@ html {
 		max-height: 80vh;
 		overflow-x: hidden;
 		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
 
 		// This removes the scrollbar in lt IE9
 		@media \0screen\,screen\9 {

diff --git a/build/modal.css b/build/modal.css
@@ -98,6 +98,7 @@ html {
   max-height: 80vh;
   overflow-x: hidden;
   overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
 }
 @media \0screen\,screen\9 {
   .modal--show .modal-content {

diff --git a/test/modal.css b/test/modal.css
@@ -123,6 +123,7 @@ html {
   max-height: 80vh;
   overflow-x: hidden;
   overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
 }
 @media \0screen\,screen\9 {
   .modal--gallery .modal-content, .modal--fade .modal-content, .modal--plainscreen .modal-content, .modal--zoomin .modal-content, .modal--zoomout .modal-content, .modal--slidefromtop .modal-content, .modal--bouncefromtop .modal-content, .modal--bouncefromtopshaky .modal-content, .modal--show .modal-content, ._modal .modal-content {