From 3da0c989b2cd7e98c2c08cf7496309e7d1219730 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Fri, 11 May 2018 19:24:44 +0200
Subject: [PATCH] fix(content): scrol-inner takes all height

---
 core/src/components/content/content.scss          | 4 ++++
 core/src/components/content/test/basic/index.html | 2 +-
 core/src/components/scroll/scroll.scss            | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/components/content/content.scss b/core/src/components/content/content.scss
index 488d4320c3c..54ed23e0ade 100644
--- a/core/src/components/content/content.scss
+++ b/core/src/components/content/content.scss
@@ -15,4 +15,8 @@ ion-content {
 
   margin: 0 !important; // scss-lint:disable all
   padding: 0 !important; // scss-lint:disable all
+
+  > .scroll-inner {
+    min-height: 100%;
+  }
 }
diff --git a/core/src/components/content/test/basic/index.html b/core/src/components/content/test/basic/index.html
index 0962435be32..75afbf52039 100644
--- a/core/src/components/content/test/basic/index.html
+++ b/core/src/components/content/test/basic/index.html
@@ -19,7 +19,7 @@
       </ion-header>
 
       <div style="display: flex; flex: 1">
-        <ion-content padding style="text-align: center; flex: 2" id="content">
+        <ion-content scroll-enabled="false" padding style="text-align: center; flex: 2" id="content">
           <f></f>
           <ion-button onclick="toggleFullscreen()">Toggle content.fullscreen</ion-button>
           <p>
diff --git a/core/src/components/scroll/scroll.scss b/core/src/components/scroll/scroll.scss
index a0739acd502..11171fec5c1 100644
--- a/core/src/components/scroll/scroll.scss
+++ b/core/src/components/scroll/scroll.scss
@@ -48,4 +48,8 @@ ion-scroll {
   &.overscroll::after {
     top: -1px;
   }
+
+  > .scroll-inner {
+    min-height: 100%;
+  }
 }