From 01323acd6a1ca0e49ea72cffa260ee15dc17cee5 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Fri, 10 Aug 2018 02:16:06 +0200
Subject: [PATCH] fix(content): scrolling Y

---
 core/src/components/content/content.scss | 10 ++--------
 core/src/components/content/content.tsx  |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/core/src/components/content/content.scss b/core/src/components/content/content.scss
index 26fdc1240c..c4273554f5 100644
--- a/core/src/components/content/content.scss
+++ b/core/src/components/content/content.scss
@@ -54,7 +54,8 @@
   overflow: hidden;
 }
 
-.scroll-x.scroll.y {
+.scroll-y,
+.scroll-x {
   -webkit-overflow-scrolling: touch;
   will-change: scroll-position;
 }
@@ -67,13 +68,6 @@
   overflow-x: auto;
 }
 
-.scroll-enabled {
-  overflow-x: hidden;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
-  will-change: scroll-position;
-}
-
 .overscroll::before,
 .overscroll::after {
   position: absolute;
diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx
index 7c889efce4..afeb8330cf 100644
--- a/core/src/components/content/content.tsx
+++ b/core/src/components/content/content.tsx
@@ -290,7 +290,6 @@ export class Content {
 
   render() {
     const { scrollX, scrollY, forceOverscroll } = this;
-    const scrollEnabled = scrollX || scrollY;
 
     this.resize();
 
@@ -300,8 +299,7 @@ export class Content {
           'inner-scroll': true,
           'scroll-x': scrollX,
           'scroll-y': scrollY,
-          'scroll-enabled': scrollEnabled,
-          'overscroll': scrollEnabled && !!forceOverscroll
+          'overscroll': (scrollX || scrollY) && !!forceOverscroll
         }}
         ref={el => this.scrollEl = el!}
         onScroll={ev => this.onScroll(ev)}>