Skip to content
This repository has been archived by the owner on Nov 29, 2022. It is now read-only.

Commit

Permalink
v1.86.0: New class for the scroll height (#285)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
smilburn1990 authored Jan 30, 2020
1 parent c783cd0 commit ce6896a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 7 additions & 5 deletions src/scss/components/optional/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ $modal-borderRadius : 4px;

&.is-fixed {
position: fixed;
height: 100%;
}

&.is-resetHeight {
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit ce6896a

Please sign in to comment.