diff --git a/CHANGELOG.md b/CHANGELOG.md index 49ee74c9..376dfead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ 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). +v2.21.0 +------------------------------ +*June 19, 2019* + +### Added +- `c-cuisinesCollage` component + +### Changed +- `fozzie` module version update + v2.20.0 ------------------------------ *June 14, 2019* diff --git a/assets/src/img/examples/collage/burger-narrow_1x.jpg b/assets/src/img/examples/collage/burger-narrow_1x.jpg new file mode 100644 index 00000000..720c0778 Binary files /dev/null and b/assets/src/img/examples/collage/burger-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/burger-narrow_2x.jpg b/assets/src/img/examples/collage/burger-narrow_2x.jpg new file mode 100644 index 00000000..bf2b7a42 Binary files /dev/null and b/assets/src/img/examples/collage/burger-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/burger-wide_1x.jpg b/assets/src/img/examples/collage/burger-wide_1x.jpg new file mode 100644 index 00000000..55cbee97 Binary files /dev/null and b/assets/src/img/examples/collage/burger-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/burger-wide_2x.jpg b/assets/src/img/examples/collage/burger-wide_2x.jpg new file mode 100644 index 00000000..55793dbf Binary files /dev/null and b/assets/src/img/examples/collage/burger-wide_2x.jpg differ diff --git a/assets/src/img/examples/collage/curry-narrow_1x.jpg b/assets/src/img/examples/collage/curry-narrow_1x.jpg new file mode 100644 index 00000000..72350a9c Binary files /dev/null and b/assets/src/img/examples/collage/curry-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/curry-narrow_2x.jpg b/assets/src/img/examples/collage/curry-narrow_2x.jpg new file mode 100644 index 00000000..d13c2bce Binary files /dev/null and b/assets/src/img/examples/collage/curry-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/curry-wide_1x.jpg b/assets/src/img/examples/collage/curry-wide_1x.jpg new file mode 100644 index 00000000..4fb04189 Binary files /dev/null and b/assets/src/img/examples/collage/curry-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/curry-wide_2x.jpg b/assets/src/img/examples/collage/curry-wide_2x.jpg new file mode 100644 index 00000000..e50054e9 Binary files /dev/null and b/assets/src/img/examples/collage/curry-wide_2x.jpg differ diff --git a/assets/src/img/examples/collage/pasta-narrow_1x.jpg b/assets/src/img/examples/collage/pasta-narrow_1x.jpg new file mode 100644 index 00000000..11a94af7 Binary files /dev/null and b/assets/src/img/examples/collage/pasta-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/pasta-narrow_2x.jpg b/assets/src/img/examples/collage/pasta-narrow_2x.jpg new file mode 100644 index 00000000..05f7c685 Binary files /dev/null and b/assets/src/img/examples/collage/pasta-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/pasta-wide_1x.jpg b/assets/src/img/examples/collage/pasta-wide_1x.jpg new file mode 100644 index 00000000..d708c4b3 Binary files /dev/null and b/assets/src/img/examples/collage/pasta-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/pasta-wide_2x.jpg b/assets/src/img/examples/collage/pasta-wide_2x.jpg new file mode 100644 index 00000000..eaf677f7 Binary files /dev/null and b/assets/src/img/examples/collage/pasta-wide_2x.jpg differ diff --git a/assets/src/img/examples/collage/pizza-narrow_1x.jpg b/assets/src/img/examples/collage/pizza-narrow_1x.jpg new file mode 100644 index 00000000..e72aa5b5 Binary files /dev/null and b/assets/src/img/examples/collage/pizza-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/pizza-narrow_2x.jpg b/assets/src/img/examples/collage/pizza-narrow_2x.jpg new file mode 100644 index 00000000..ccf92b62 Binary files /dev/null and b/assets/src/img/examples/collage/pizza-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/pizza-wide_1x.jpg b/assets/src/img/examples/collage/pizza-wide_1x.jpg new file mode 100644 index 00000000..1b510369 Binary files /dev/null and b/assets/src/img/examples/collage/pizza-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/pizza-wide_2x.jpg b/assets/src/img/examples/collage/pizza-wide_2x.jpg new file mode 100644 index 00000000..1a728ade Binary files /dev/null and b/assets/src/img/examples/collage/pizza-wide_2x.jpg differ diff --git a/assets/src/img/examples/collage/salad-narrow_1x.jpg b/assets/src/img/examples/collage/salad-narrow_1x.jpg new file mode 100644 index 00000000..72621d0c Binary files /dev/null and b/assets/src/img/examples/collage/salad-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/salad-narrow_2x.jpg b/assets/src/img/examples/collage/salad-narrow_2x.jpg new file mode 100644 index 00000000..f42eb0ce Binary files /dev/null and b/assets/src/img/examples/collage/salad-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/salad-wide_1x.jpg b/assets/src/img/examples/collage/salad-wide_1x.jpg new file mode 100644 index 00000000..7034d993 Binary files /dev/null and b/assets/src/img/examples/collage/salad-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/salad-wide_2x.jpg b/assets/src/img/examples/collage/salad-wide_2x.jpg new file mode 100644 index 00000000..7ec91592 Binary files /dev/null and b/assets/src/img/examples/collage/salad-wide_2x.jpg differ diff --git a/assets/src/img/examples/collage/sushi-narrow_1x.jpg b/assets/src/img/examples/collage/sushi-narrow_1x.jpg new file mode 100644 index 00000000..ae45c4e7 Binary files /dev/null and b/assets/src/img/examples/collage/sushi-narrow_1x.jpg differ diff --git a/assets/src/img/examples/collage/sushi-narrow_2x.jpg b/assets/src/img/examples/collage/sushi-narrow_2x.jpg new file mode 100644 index 00000000..9d59b289 Binary files /dev/null and b/assets/src/img/examples/collage/sushi-narrow_2x.jpg differ diff --git a/assets/src/img/examples/collage/sushi-wide_1x.jpg b/assets/src/img/examples/collage/sushi-wide_1x.jpg new file mode 100644 index 00000000..38f48fed Binary files /dev/null and b/assets/src/img/examples/collage/sushi-wide_1x.jpg differ diff --git a/assets/src/img/examples/collage/sushi-wide_2x.jpg b/assets/src/img/examples/collage/sushi-wide_2x.jpg new file mode 100644 index 00000000..4b3cb4b5 Binary files /dev/null and b/assets/src/img/examples/collage/sushi-wide_2x.jpg differ diff --git a/assets/src/scss/_dependencies.scss b/assets/src/scss/_dependencies.scss index 34b02c55..84f232e0 100644 --- a/assets/src/scss/_dependencies.scss +++ b/assets/src/scss/_dependencies.scss @@ -39,6 +39,7 @@ $font-path: '/assets/fonts'; @include rating(); @include toast(); @include cuisinesWidget(); +@include cuisinesCollage(); @include appsBanner(); @include cookieWarning(); @include overflowCarousel(); diff --git a/docs/src/templates/includes/components/core/je-cuisinesCollage.hbs b/docs/src/templates/includes/components/core/je-cuisinesCollage.hbs new file mode 100644 index 00000000..07b23249 --- /dev/null +++ b/docs/src/templates/includes/components/core/je-cuisinesCollage.hbs @@ -0,0 +1,76 @@ +
+

+ Great local takeaways +

+

+ Order for delivery or collection from the best selection of independent restaurants +

+
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
diff --git a/docs/src/templates/pages/styleguide/ui-components/cuisines-collage.hbs b/docs/src/templates/pages/styleguide/ui-components/cuisines-collage.hbs new file mode 100644 index 00000000..03ae2771 --- /dev/null +++ b/docs/src/templates/pages/styleguide/ui-components/cuisines-collage.hbs @@ -0,0 +1,24 @@ +--- +title: Cuisines Collage +section-title: UI Components +docs: true + +navgroup: styleguide +navsub: ui-components +navactive: cuisines-collage +layout: components +--- + +

The c-cuisinesCollage component is an optional mixin within Fozzie — if you'd like to use it in your project you can include it by adding @include cuisinesCollage(); into your SCSS dependencies file.

+ +

Cuisines Collage

+

Styles look a little bit broken here because of fixed width container. In future full width block will be avaliable in UI templates page.

+ +{{#>demo-block demoVisualCssClass="demo-visual--spacingTopAndBottom"}} +
+
+{{> je-cuisinesCollage }} +
+
+ +{{/demo-block }} diff --git a/docs/src/templates/pages/styleguide/ui-components/index.hbs b/docs/src/templates/pages/styleguide/ui-components/index.hbs index 735f688e..bb6b894e 100644 --- a/docs/src/templates/pages/styleguide/ui-components/index.hbs +++ b/docs/src/templates/pages/styleguide/ui-components/index.hbs @@ -43,6 +43,7 @@ Note. Only components that are part of the global platform should be added to th - [Headers](headers/) - [Footers](footers/) - [Cuisines Widget](cuisines-widget) +- [Cuisines Collage](cuisines-collage) - [Apps Banner](apps-banner) - [Order Card](order-card) {{/markdown}} diff --git a/package.json b/package.json index 8dec2828..0e0b1497 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "je-global-component-library", "title": "Just Eat – Component Library", "description": "Component Library and Guidelines for all of Just Eat’s Front-End Platforms", - "version": "2.20.0", + "version": "2.21.0", "homepage": "https://github.com/justeat/global-component-library", "contributors": [ "Github contributors " @@ -26,7 +26,7 @@ "@justeat/f-toggle": "1.1.0", "@justeat/f-utilities": "0.8.2", "@justeat/f-validate": "1.4.0", - "@justeat/fozzie": "1.54.0", + "@justeat/fozzie": "1.56.0", "bezier-easing": "2.1.0", "kickoff-grid.css": "1.2.0", "lite-ready": "1.0.4", diff --git a/yarn.lock b/yarn.lock index 8de8be16..0ae2f2e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,10 +1011,10 @@ kickoff-grid.css "1.2.0" normalize-scss "7.0.1" -"@justeat/fozzie@1.54.0": - version "1.54.0" - resolved "https://registry.yarnpkg.com/@justeat/fozzie/-/fozzie-1.54.0.tgz#287f8231cdae40f42aa7c72e371556708b825e74" - integrity sha512-yeOJOagTf0OL30gXA5hsCo9BYuZHY78l2jVo3t7btfSxTX565ycLJ49pv9thwDbOXGxBJqo9BVTP3okETzQObw== +"@justeat/fozzie@^1.56.0": + version "1.56.0" + resolved "https://registry.yarnpkg.com/@justeat/fozzie/-/fozzie-1.56.0.tgz#e0169ca108a4df012b30541128c6a94a588aadd4" + integrity sha512-TTdTRIsrJswt3mV0jTvvjNHSy+yjVuVosvgRzWshjqzc+et14VQxveVm3IkgHmUHiRpTFI+m9mjghDkB6iycQA== dependencies: "@justeat/f-dom" "1.1.0" "@justeat/f-logger" "0.7.1" @@ -1975,13 +1975,13 @@ aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" -axios@0.18.1: - version "0.18.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" - integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== +axios@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d" + integrity sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0= dependencies: - follow-redirects "1.5.10" - is-buffer "^2.0.2" + follow-redirects "^1.2.5" + is-buffer "^1.1.5" babel-code-frame@^6.26.0: version "6.26.0" @@ -3963,13 +3963,13 @@ debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.4.1, de dependencies: ms "2.0.0" -debug@3.1.0, debug@=3.1.0, debug@~3.1.0: +debug@3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: ms "2.0.0" -debug@3.X, debug@^3.1.0: +debug@3.X, debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" dependencies: @@ -5436,12 +5436,12 @@ follow-redirects@0.0.7: debug "^2.2.0" stream-consume "^0.1.0" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== +follow-redirects@^1.2.5: + version "1.7.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" + integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== dependencies: - debug "=3.1.0" + debug "^3.2.6" fontfaceobserver@^2.0.13: version "2.1.0" @@ -7047,11 +7047,6 @@ is-buffer@^1.0.2, is-buffer@^1.1.0, is-buffer@^1.1.4, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" -is-buffer@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" - integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== - is-builtin-module@^1.0.0: version "1.0.0" resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"