diff options
| author | patrickhlauke <[email protected]> | 2018-10-15 20:53:51 +0100 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2018-10-20 15:32:09 +0300 |
| commit | 7b8f01d839aa2d2683bd5f90f79fe632d58bf9a4 (patch) | |
| tree | 4cf33dc55fe054ffb1e3178fb394a257494a091b | |
| parent | 735c374e9c366446afb30e20592ac1d796c7bb69 (diff) | |
| download | bootstrap-7b8f01d839aa2d2683bd5f90f79fe632d58bf9a4.tar.xz bootstrap-7b8f01d839aa2d2683bd5f90f79fe632d58bf9a4.zip | |
Use correct touch-action values
- my fault, my original advice of using `touch-action: pan-x` is exactly the value we *don't* want to have the browser handle...
| -rw-r--r-- | js/tests/unit/carousel.js | 2 | ||||
| -rw-r--r-- | scss/_carousel.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index 68c28aec5..932b90f7d 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -19,7 +19,7 @@ $(function () { var stylesCarousel = [ '<style>', - ' .carousel.pointer-event { -ms-touch-action: pan-x; touch-action: pan-x; }', + ' .carousel.pointer-event { -ms-touch-action: pan-y pinch-zoom; touch-action: pan-y pinch-zoom; }', '</style>' ].join('') diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 7d3728b40..130965f79 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -13,7 +13,7 @@ } .carousel.pointer-event { - touch-action: pan-x; + touch-action: pan-y pinch-zoom; } .carousel-inner { |