From bb72da6cff38e2ffe7aa74053088d6d5c85c9a3d Mon Sep 17 00:00:00 2001 From: Sebastian Fey Date: Wed, 13 Jan 2021 20:50:03 +0100 Subject: [PATCH 1/3] Updated nutrition info heading color and removed nutrition info list bullets Signed-off-by: Sebastian Fey --- src/components/RecipeNutritionInfoItem.vue | 3 ++- src/components/RecipeView.vue | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/RecipeNutritionInfoItem.vue b/src/components/RecipeNutritionInfoItem.vue index bf548b3dd..8a8f9a239 100644 --- a/src/components/RecipeNutritionInfoItem.vue +++ b/src/components/RecipeNutritionInfoItem.vue @@ -35,7 +35,8 @@ li { li .title { margin-bottom: 0em; - color: var(--color-primary); + color: var(--color-main-text); + font-weight: bolder; } diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue index 3694be1d9..822dd5f3c 100644 --- a/src/components/RecipeView.vue +++ b/src/components/RecipeView.vue @@ -58,7 +58,7 @@

{{ t('cookbook', 'Nutrition Information') }}

-
    +
      @@ -379,6 +379,10 @@ aside { margin-top: 2rem; } + .nutrition-items { + list-style-type: none !important; + } + .times { display: flex; margin-top: 10px; From 56c6364d7824818e262589aede4b69bcc625528b Mon Sep 17 00:00:00 2001 From: Sebastian Fey Date: Wed, 13 Jan 2021 20:52:09 +0100 Subject: [PATCH 2/3] Updated CHANGELOG Signed-off-by: Sebastian Fey --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be823dcc..2c72bab59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ [#505](https://github.com/nextcloud/cookbook/pull/505) @christianlupus - Allow pasting of instructions without newline again [#503](https://github.com/nextcloud/cookbook/pull/503) @christianlupus +- Updated color and bullets in nutrition information, fixes #510 + [#511](https://github.com/nextcloud/cookbook/pull/511/) @seyfeb ## 0.7.8 - 2021-01-08 From 512737cc43b27448229c50ec06a45a9f6fdd2144 Mon Sep 17 00:00:00 2001 From: Sebastian Fey Date: Thu, 14 Jan 2021 21:47:03 +0100 Subject: [PATCH 3/3] Updated CSS Signed-off-by: Sebastian Fey --- css/style.css | 25 +++++++++++-------------- src/components/RecipeView.vue | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/css/style.css b/css/style.css index d07811944..c4960bf11 100755 --- a/css/style.css +++ b/css/style.css @@ -113,22 +113,19 @@ flex-basis: 20rem; padding-right: 2rem; } - #app-content-wrapper aside ul { - list-style-type: disc; + #app-content-wrapper aside ul li { + margin-left: 1em; } - #app-content-wrapper aside ul li { - margin-left: 1em; + #app-content-wrapper aside ul li span, + #app-content-wrapper aside ul li input[type="checkbox"] { + line-height: 1rem; + margin: 0 0.5rem 0 0; + padding: 0; + height: auto; + width: 1rem; + display: inline-block; + vertical-align: middle; } - #app-content-wrapper aside ul li span, - #app-content-wrapper aside ul li input[type="checkbox"] { - line-height: 1rem; - margin: 0 0.5rem 0 0; - padding: 0; - height: auto; - width: 1rem; - display: inline-block; - vertical-align: middle; - } #app-content-wrapper .recipe-content { padding: 1rem; diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue index 822dd5f3c..2982dd53a 100644 --- a/src/components/RecipeView.vue +++ b/src/components/RecipeView.vue @@ -380,7 +380,7 @@ aside { } .nutrition-items { - list-style-type: none !important; + list-style-type: none; } .times {