From edf074173912a7511e9e8a27c9a5492a5f28f277 Mon Sep 17 00:00:00 2001 From: Johannes Roth Date: Sat, 2 Dec 2023 21:46:20 +0100 Subject: [PATCH 1/2] Replace checkmark with strikethrough for recipe ingredients Signed-off-by: Johannes Roth --- src/components/RecipeIngredient.vue | 31 ++++------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/src/components/RecipeIngredient.vue b/src/components/RecipeIngredient.vue index ade0f7896..7d20cd7b6 100644 --- a/src/components/RecipeIngredient.vue +++ b/src/components/RecipeIngredient.vue @@ -6,9 +6,8 @@ }" @click="toggleDone" > -
- +
@@ -44,6 +43,9 @@ export default { } return this.ingredient }, + formattedIngredient() { + return this.isDone ? `~~${this.displayIngredient}~~` : `**${this.displayIngredient}**`; + }, }, methods: { isHeader() { @@ -69,37 +71,12 @@ li { list-style-type: none; } -.unindented { - position: relative; - left: -1.25em; -} - -li > .checkmark { - display: inline; - visibility: hidden; -} - -li > .done { - visibility: visible; -} - -li:hover > .checkmark { - color: var(--color-primary-element); - opacity: 0.5; - visibility: visible; -} - li > .ingredient { display: inline; padding-left: 1em; - margin-left: 0.3em; text-indent: -1em; } -.ingredient:deep(a) { - text-decoration: underline; -} - li > span.icon-error { margin-left: 0.3em; } From cf08dd64e07fadffa343f750abec50f7d838042f Mon Sep 17 00:00:00 2001 From: Johannes Roth Date: Sat, 2 Dec 2023 21:58:42 +0100 Subject: [PATCH 2/2] Replace checkmark with strikethrough for recipe ingredients Signed-off-by: Johannes Roth --- CHANGELOG.md | 2 ++ src/components/RecipeIngredient.vue | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d9eb2f1e..b37619ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ [#1767](https://github.com/nextcloud/cookbook/pull/1767) @lneugebauer - Show info for empty cookbook or categories in recipe overview [#1866](https://github.com/nextcloud/cookbook/pull/1866) @seyfeb +- Replace checkmark with strikethrough for recipe ingredients + [#1908](https://github.com/nextcloud/cookbook/pull/1908) @j0hannesr0th ### Fixed - Fix translation string to not contain quotes diff --git a/src/components/RecipeIngredient.vue b/src/components/RecipeIngredient.vue index 7d20cd7b6..70277ba68 100644 --- a/src/components/RecipeIngredient.vue +++ b/src/components/RecipeIngredient.vue @@ -7,7 +7,7 @@ @click="toggleDone" >
- +
@@ -44,7 +44,9 @@ export default { return this.ingredient }, formattedIngredient() { - return this.isDone ? `~~${this.displayIngredient}~~` : `**${this.displayIngredient}**`; + return this.isDone + ? `~~${this.displayIngredient}~~` + : `**${this.displayIngredient}**` }, }, methods: {