+
@@ -31,18 +32,18 @@
-
+
diff --git a/frontend/components/Domain/Recipe/RecipePrintView.vue b/frontend/components/Domain/Recipe/RecipePrintView.vue
index 01e5b45dd..e1d792cb5 100644
--- a/frontend/components/Domain/Recipe/RecipePrintView.vue
+++ b/frontend/components/Domain/Recipe/RecipePrintView.vue
@@ -30,12 +30,17 @@
-
+
+
+
+
diff --git a/frontend/components/Domain/Recipe/RecipeTimeCard.vue b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
index 9758c4319..f0a6b6dbc 100644
--- a/frontend/components/Domain/Recipe/RecipeTimeCard.vue
+++ b/frontend/components/Domain/Recipe/RecipeTimeCard.vue
@@ -1,41 +1,33 @@
-
-
-
-
-
-
-
- {{ $globals.icons.clockOutline }}
-
- {{ time.name }} |
- {{ time.value }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
{{ $globals.icons.clockOutline }}
- {{ time.name }} |
- {{ time.value }}
-
-
+ {{ validateTotalTime.name }}
{{ validateTotalTime.value }}
+
+
+
+
+
+
+
+
+ {{ $globals.icons.knfife }}
+
+
{{ validatePrepTime.name }}
{{ validatePrepTime.value }}
+
+
+
+
+ {{ $globals.icons.potSteam }}
+
+
{{ validatePerformTime.name }}
{{ validatePerformTime.value }}
+
+
+
@@ -44,10 +36,6 @@ import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
export default defineComponent({
props: {
- stacked: {
- type: Boolean,
- default: false,
- },
prepTime: {
type: String,
default: null,
@@ -64,9 +52,9 @@ export default defineComponent({
type: String,
default: "accent custom-transparent"
},
- containerClass: {
- type: String,
- default: undefined,
+ small: {
+ type: Boolean,
+ default: false,
},
},
setup(props) {
@@ -92,13 +80,16 @@ export default defineComponent({
return !isEmpty(props.performTime) ? { name: i18n.t("recipe.perform-time"), value: props.performTime } : null;
});
- const allTimes = computed(() => {
- return [validateTotalTime.value, validatePrepTime.value, validatePerformTime.value].filter((x) => x !== null);
+ const fontSize = computed(() => {
+ return props.small ? { fontSize: "smaller" } : { fontSize: "larger" };
});
return {
showCards,
- allTimes,
+ validateTotalTime,
+ validatePrepTime,
+ validatePerformTime,
+ fontSize,
};
},
});
diff --git a/frontend/components/Domain/Recipe/RecipeYield.vue b/frontend/components/Domain/Recipe/RecipeYield.vue
index 2ecb66b91..bc68a6d0f 100644
--- a/frontend/components/Domain/Recipe/RecipeYield.vue
+++ b/frontend/components/Domain/Recipe/RecipeYield.vue
@@ -1,21 +1,20 @@
-
-
-
- {{ $globals.icons.potSteam }}
+
+
+
+ {{ $globals.icons.bread }}
-
-
-
+
+ {{ $i18n.tc("recipe.yield") }}
+
+ {{ text }}
+
+