diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk index 2f5c0ab..16f2a81 100644 --- a/src/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -23,7 +23,7 @@ bodyClass: c-home {% if collections["Favourite ⭐"] %}
-

{{ favouriteRecipes }}

+

{{ favouriteRecipes }}

{% set favouriteRecipes = collections["Favourite ⭐"] | limit(4) %} {% for recipe in favouriteRecipes %} diff --git a/src/_includes/layouts/recipe.njk b/src/_includes/layouts/recipe.njk index 8ed301d..b2c8a65 100644 --- a/src/_includes/layouts/recipe.njk +++ b/src/_includes/layouts/recipe.njk @@ -54,7 +54,7 @@
-
+
{% if sourceLabel and sourceURL %}

Source : {{ sourceLabel }}

{% endif %} diff --git a/src/_includes/layouts/recipes-list.njk b/src/_includes/layouts/recipes-list.njk index 691c8a1..ab72f3b 100644 --- a/src/_includes/layouts/recipes-list.njk +++ b/src/_includes/layouts/recipes-list.njk @@ -6,7 +6,9 @@

{{ selectedTag }}{{ " " if selectedTag }}{{title}}

- {% include 'components/taglist.njk' %} + {% if not selectedTag %} + {% include 'components/taglist.njk' %} + {% endif %}
@@ -38,5 +40,12 @@
+ {% if selectedTag %} +
+
+ {% include 'components/taglist.njk' %} +
+
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/src/about.md b/src/about.md index 5150560..cd1aa4e 100644 --- a/src/about.md +++ b/src/about.md @@ -1,7 +1,7 @@ --- layout: layouts/base.njk title: About -bodyClass: about +bodyClass: u-free-text --- ![A picture of a black pug wearing a pilot jacket](/img/about.jpg) \ diff --git a/src/scss/_global.scss b/src/scss/_global.scss index e5e9a99..a325f9d 100644 --- a/src/scss/_global.scss +++ b/src/scss/_global.scss @@ -40,21 +40,22 @@ section { } } +h1, h2, h3, h4, h5, h6 { + margin: 0; +} + h1 { text-align: center; font-size: clamp(3rem,calc(1rem + 3vw),4rem); - margin-bottom: 18px; } h2 { text-align: center; font-size: clamp(2rem,calc(1rem + 2vw),3.4rem); - margin-bottom: 42px; } h3 { font-size: clamp(1.6rem,calc(1rem + 1vw),2.6rem); - margin-bottom: 18px; } a { diff --git a/src/scss/_utility.scss b/src/scss/_utility.scss index 56d198e..4b41af7 100644 --- a/src/scss/_utility.scss +++ b/src/scss/_utility.scss @@ -32,4 +32,14 @@ .u-highlight { background-color: rgba(250, 243, 145, 0.5); +} + +.u-free-text { + p, h2, h3, h4, h5, h6 { + margin-bottom: 18px; + } +} + +.u-mb-large { + margin-bottom: 30px; } \ No newline at end of file diff --git a/src/scss/components/_card.scss b/src/scss/components/_card.scss index 41cb467..824ee54 100644 --- a/src/scss/components/_card.scss +++ b/src/scss/components/_card.scss @@ -81,5 +81,4 @@ .c-card__title { font-size: 1.4rem; - margin: 0; } \ No newline at end of file diff --git a/src/scss/components/_recipe.scss b/src/scss/components/_recipe.scss index e91ac8d..83f562a 100644 --- a/src/scss/components/_recipe.scss +++ b/src/scss/components/_recipe.scss @@ -87,8 +87,4 @@ @include mq(medium) { grid-area: instructions; } - - p { - margin-bottom: 18px; - } } \ No newline at end of file