1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-02 20:15:24 +02:00

Feature/recipe instructions improvements (#785)

* feat(frontend):  split paragraph by 1. 1) or 1: regex matches

* feat(frontend):  Update frontend to support ingredient To step refs

* feat(backend):  Update backend to support ingredient to step refs

* fix title editor

* move about info to site-settings

* update change-log

Co-authored-by: Hayden K <hay-kot@pm.me>
This commit is contained in:
Hayden 2021-11-05 15:48:10 -08:00 committed by GitHub
parent 9f8c61a75a
commit 5cb4a1ade0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 621 additions and 210 deletions

View file

@ -12,7 +12,7 @@
v-on="$listeners"
@click="download ? downloadFile() : undefined"
>
<v-icon left>
<v-icon v-if="!iconRight" left>
<slot name="icon">
{{ btnAttrs.icon }}
</slot>
@ -20,6 +20,11 @@
<slot name="default">
{{ btnAttrs.text }}
</slot>
<v-icon v-if="iconRight" right>
<slot name="icon">
{{ btnAttrs.icon }}
</slot>
</v-icon>
</v-btn>
</template>
@ -96,6 +101,10 @@ export default {
type: String,
default: null,
},
iconRight: {
type: Boolean,
default: false,
},
},
setup() {
const api = useApiSingleton();

View file

@ -1,7 +1,7 @@
<template>
<v-menu offset-y>
<template #activator="{ on, attrs }">
<v-btn color="primary" v-bind="attrs" :class="btnClass" :disabled="disabled" v-on="on">
<v-btn color="primary" v-bind="{ ...attrs, ...$attrs }" :class="btnClass" :disabled="disabled" v-on="on">
<v-icon v-if="activeObj.icon" left>
{{ activeObj.icon }}
</v-icon>