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

Commit

Permalink
v1.29.0 small styles tweaks for c-orderCard and c-overflowCarousel (#202
Browse files Browse the repository at this point in the history
)

* v1.29.0 small styles tweaks for c-orderCard and c-overflowCarousel components

* v1.29.0 Add o-links classes
  • Loading branch information
dandel10n authored and sonnyprince committed Feb 6, 2019
1 parent 8c50eb1 commit 3718a9e
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,37 @@
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.29.0
------------------------------
*February 6, 2019*

### Changed
- Fix some styles for `c-orderCard` and `c-overflowCarousel` components

### Added
- `.o-link` classes


v1.28.0
------------------------------
*January 31 2018*
*January 31, 2019*

### Added
- more cookie warning tweaks


v1.27.0
------------------------------
*January 31 2018*
*January 31, 2019*

### Added
- cookie warning text style tweaks


v1.26.0
------------------------------
*January 29, 2018*
*January 29, 2019*

### Added
- cookie warning styles
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.28.0",
"version": "1.29.0",
"main": "dist/js/index.js",
"files": [
"dist/js",
Expand Down
9 changes: 8 additions & 1 deletion src/scss/components/optional/_order-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ $previousOrder-hoverBoxShadow: 0 2px 8px 0 rgba(0, 0, 0, 0.16), -2px -2px 4px 0
text-decoration: none;
color: $grey--mid;
width: 280px;
max-width: 280px;
min-height: 259px;

@include media('>=mid') {
width: 392px;
max-width: 392px;
min-height: 302px;
}

Expand All @@ -41,9 +43,14 @@ $previousOrder-hoverBoxShadow: 0 2px 8px 0 rgba(0, 0, 0, 0.16), -2px -2px 4px 0

.c-orderCard-image {
width: 100%;
height: auto;
height: 103px;
overflow: hidden;
position: relative;

@include media('>=mid') {
height: 145px;
}

img {
vertical-align: bottom;
width: 100%;
Expand Down
4 changes: 4 additions & 0 deletions src/scss/components/optional/_overflow-carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
flex: 0 0 spacing(x2);
}

@include media('>mid') {
padding: spacing() spacing(x2);
}

.c-overflowCarousel-item {
flex: 1 0 auto;
margin-right: spacing();
Expand Down
13 changes: 13 additions & 0 deletions src/scss/objects/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,16 @@ a {
// text-decoration: none;
// }
}

.o-link--full {
width: 100%;
display: block;
}

.o-link--noDecoration {
text-decoration: none;
}

.o-link--bold {
font-weight: $font-weight-bold;
}

0 comments on commit 3718a9e

Please sign in to comment.