mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-03 05:11:31 -05:00
various improvements
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<component :is="compiled_instructions" :ingredient_factor="ingredient_factor" :instructions_html="instructions_html"></component>
|
||||
<!-- <div v-html="instructions_html"></div>-->
|
||||
<!-- <div v-html="instructions_html"></div>-->
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -31,7 +31,8 @@ export default defineComponent({
|
||||
ingredient_factor: {type: Number, required: true},
|
||||
},
|
||||
components: {ScalableNumber,},
|
||||
template: `<div>${this.instructions_html}</div>`
|
||||
template: `
|
||||
<div>${this.instructions_html}</div>`
|
||||
}))
|
||||
}
|
||||
},
|
||||
@@ -41,3 +42,14 @@ export default defineComponent({
|
||||
})
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
/**
|
||||
vuetify removes all margins and paddings which break layout, re-add them by reverting vuetify change
|
||||
*/
|
||||
p, ol, ul, li {
|
||||
padding: revert;
|
||||
margin: revert;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<v-col cols="12" md="6" v-if="step.ingredients.length > 0">
|
||||
<ingredients-table v-model="step.ingredients" :ingredient-factor="ingredientFactor"></ingredients-table>
|
||||
</v-col>
|
||||
<v-col cols="12" md="6">
|
||||
<v-col cols="12" md="6" class="markdown-body">
|
||||
<instructions :instructions_html="step.instructionsMarkdown" :ingredient_factor="ingredientFactor" v-if="step.instructionsMarkdown != undefined"></instructions>
|
||||
<!-- sub recipes dont have a correct schema, thus they use different variable naming -->
|
||||
<instructions :instructions_html="step.instructions_markdown" :ingredient_factor="ingredientFactor" v-else></instructions>
|
||||
|
||||
Reference in New Issue
Block a user