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

Commit

Permalink
v1.59.0 — Updated collapsible card styles. (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
DamianMullins authored Jul 8, 2019
1 parent 8ca6991 commit 3426dd1
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 24 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
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.59.0
------------------------------
*July 8, 2019*

### Changed
- Updated collapsible card styles.

v1.58.0
------------------------------
*July 3, 2019*
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.58.0",
"version": "1.59.0",
"main": "dist/js/index.js",
"files": [
"dist/js",
Expand Down
4 changes: 3 additions & 1 deletion src/scss/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $card-section-margin--large : spacing(x8);
$card-section-highlight-backgroundColor : $orange;
$card-section-highlight-color : $white;
$card-section-collapsible-paddingRight : 60px;
$card-section-collapsed-height : 34px;
$card-section-collapsed-height : 48px;
$card-section-collapsed-height--aboveMid : 50px;


Expand Down Expand Up @@ -168,11 +168,13 @@ $card-section-collapsed-height--aboveMid : 50px;

.c-card-section--collapsible {
overflow: hidden;
padding-bottom: spacing(x2);
padding-right: $card-section-collapsible-paddingRight;
position: relative;
user-select: none;

@include media('>=mid') {
padding-bottom: 0;
padding-right: $card-section-collapsible-paddingRight;
}

Expand Down
44 changes: 22 additions & 22 deletions src/scss/components/optional/_listings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
margin-bottom: spacing(x2);
box-shadow: 0 2px 4px 0 rgba($black, 0.1);
padding-bottom: spacing();

@include media('>mid') {
min-height: 96px;
padding: spacing(x0.5);
}

&.is-active {
display: block;
}
&.is-inactive {
display: none;
}

.c-listing--inactive & {
opacity: 0.6;
}
Expand All @@ -118,7 +118,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
overflow: hidden;
// Specific padding top % is based on an image size of 288x104 and maintaining an aspect ratio of 36 : 13
padding-top: calc(37.69% + #{spacing(x0.5)});

@include media('>mid') {
padding-top: spacing();
}
Expand All @@ -131,7 +131,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
overflow: hidden;
position: absolute;
padding-top: 37.69%;

@include media('>mid') {
width: 87px;
height: 87px;
Expand All @@ -140,41 +140,41 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
left: spacing(x0.5);
border-radius: spacing(x0.5);
}

@include media('>=wide') {
width: 17.5%;
}

&:not(.c-listing-item-header--noImage) {
@include anim();
}
}

.c-listing-item-header-img {
top: 50%;
left: 50%;
width: 100%;
height: auto;
position: absolute;
transform: translate(-50%, -50%);

@include media('>mid') {
width: auto;
height: 100%;
max-width: none !important;
}
}

.c-listing-item-header-frame {
left: 0;
bottom: 0;
position: absolute;

svg {
height: 45px;
vertical-align: bottom;
}

@include media('>mid') {
display: none;
}
Expand All @@ -186,7 +186,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
display: block;
color: $color-text;
text-decoration: none;

&:hover,
&:active,
&:focus {
Expand Down Expand Up @@ -217,7 +217,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
position: absolute;
border: 1px solid $grey--lightest;
border-radius: $listing-img-border-radius;

@include media('>=wide') {
width: 65px;
height: 65px;
Expand All @@ -227,7 +227,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
.c-listing-item--withHeader & {
top: auto;
transform: translateY(-4px);

@include media('>mid') {
top: 20px;
left: 60px;
Expand All @@ -251,7 +251,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
color: $color-text;
padding-left: 70px;
min-height: 60px;

@include media('>mid') {
width: 55%;
padding-top: spacing();
Expand Down Expand Up @@ -280,7 +280,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
word-break: break-word;
padding-right: spacing();
@include font-size(base--scaleUp, false);

@include media('>mid') {
margin: spacing(x0.5) 0;
padding-right: spacing(x2);
Expand All @@ -297,13 +297,13 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
.c-listing-item-details {
width: 100%;
position: relative;

@include media('>mid') {
width: 45%;
margin-top: auto;
padding: spacing() spacing() 0 spacing(x2);
}

@include media('>=wide') {
width: 45%;
}
Expand Down Expand Up @@ -374,11 +374,11 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);

.c-listing-item-meta {
text-align: left;

@include media('>mid') {
padding-left: 27px;
}

@include media('>=wide') {
padding-left: 0;
text-align: right;
Expand All @@ -389,7 +389,7 @@ $listing--inactive-bg : rgba($listing-bg, 0.5);
padding: 1px 4px;
margin-bottom: spacing();
@include font-size(small, false);

@include media('>mid') {
@include font-size(base, false);
}
Expand Down

0 comments on commit 3426dd1

Please sign in to comment.