From ce6896a658986004370e1b9c341c370b131d8f0b Mon Sep 17 00:00:00 2001
From: Sean Milburn <seanmilburn1990@gmail.com>
Date: Thu, 30 Jan 2020 11:33:04 +0000
Subject: [PATCH] v1.86.0: New class for the scroll height (#285)

* v1.87.0: New class for the scroll height

* v1.87.0: New class for the scroll height

* v1.87.0: Put old version first

* Removed height on class for android fix
---
 CHANGELOG.md                             |  8 ++++++++
 package.json                             |  2 +-
 src/scss/components/optional/_modal.scss | 12 +++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d61320..02f4790d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
 
+v1.86.0
+------------------------------
+*January 28, 2020*
+
+### Added
+- Separate class for the height of the scroll page - `c-modal-content-scrollHeight`
+
+
 v1.85.0
 ------------------------------
 *January 23, 2020*
diff --git a/package.json b/package.json
index a9947e68..d28714a9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "@justeat/fozzie",
   "title": "Fozzie – Just Eat UI Web Framework",
   "description": "UI Web Framework for the Just Eat Global Platform",
-  "version": "1.85.0",
+  "version": "1.86.0",
   "main": "dist/js/index.js",
   "files": [
     "dist/js",
diff --git a/src/scss/components/optional/_modal.scss b/src/scss/components/optional/_modal.scss
index c3d2becc..8e250eab 100644
--- a/src/scss/components/optional/_modal.scss
+++ b/src/scss/components/optional/_modal.scss
@@ -106,7 +106,6 @@ $modal-borderRadius     : 4px;
 
                 &.is-fixed {
                     position: fixed;
-                    height: 100%;
                 }
 
                 &.is-resetHeight {
@@ -138,11 +137,8 @@ $modal-borderRadius     : 4px;
                 display: block;
             }
 
-        .c-modal-content-scrollable {
+        .c-modal-content-scrollHeight {
             max-height: 100vh;
-            overflow-x: hidden;
-            overflow-y: auto;
-            position: relative;
 
             @include media('>=mid') {
                 max-height: 550px;
@@ -157,6 +153,12 @@ $modal-borderRadius     : 4px;
             }
         }
 
+        .c-modal-content-scrollable {
+            overflow-x: hidden;
+            overflow-y: auto;
+            position: relative;
+        }
+
         .c-modal-actions {
             background-color: $white;
             box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.12);