From 4fe19b88ca4919dd35e728569560fc96df0ee6ad Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Wed, 11 May 2022 17:14:03 -0800 Subject: [PATCH] ux: unify UI based on user-feedback (#1216) * unify UI based on user-feedback * fix layout shify error * implement drag and drop animation --- .../components/Domain/Recipe/RecipeCard.vue | 10 +- .../RecipeCategoryTagToolContextMenu.vue | 3 +- .../Domain/Recipe/RecipeDialogBulkAdd.vue | 67 +++-- .../Domain/Recipe/RecipeIngredientEditor.vue | 68 ++--- .../Domain/Recipe/RecipeInstructions.vue | 238 ++++++++++-------- .../components/Domain/Recipe/RecipeNotes.vue | 26 +- .../components/global/BaseButtonGroup.vue | 2 +- frontend/lang/messages/en-US.json | 5 +- frontend/pages/recipe/_slug/index.vue | 57 ++++- 9 files changed, 282 insertions(+), 194 deletions(-) diff --git a/frontend/components/Domain/Recipe/RecipeCard.vue b/frontend/components/Domain/Recipe/RecipeCard.vue index 0bf6d418f753..ec0f66ba3f92 100644 --- a/frontend/components/Domain/Recipe/RecipeCard.vue +++ b/frontend/components/Domain/Recipe/RecipeCard.vue @@ -24,19 +24,21 @@ - +
{{ name }}
- - - + + + + import { defineComponent, reactive, toRefs, useContext } from "@nuxtjs/composition-api"; +import colors from "vuetify/lib/util/colors"; import { useUserApi } from "~/composables/api"; export interface ContextMenuIncludes { @@ -91,7 +92,7 @@ export default defineComponent({ }, color: { type: String, - default: "primary", + default: colors.grey.darken2, }, slug: { type: String, diff --git a/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue b/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue index 733a66fa0c98..f3f3660fffda 100644 --- a/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue +++ b/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue @@ -8,7 +8,7 @@ - + {{ $globals.icons.createAlt }} @@ -21,34 +21,26 @@ v-model="inputText" outlined rows="12" + hide-details :placeholder="$t('new-recipe.paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list')" > - - - Trim leading and trailing whitespace as well as blank lines - - - - Trim first character from each line - - - - Attempts to split a paragraph by matching 1) or 1. patterns - + + @@ -64,7 +56,7 @@ + +