Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes: PWA & interface on small screens #2536

Merged
merged 7 commits into from
Oct 7, 2023
Merged

fixes: PWA & interface on small screens #2536

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e538c5c
fix pwa icons
p0lycarpio Sep 3, 2023
e2665bc
fix spacing and layouts for small screens
p0lycarpio Sep 4, 2023
150a961
translate missing strings
p0lycarpio Sep 4, 2023
6687850
Merge branch 'mealie-next' into fix/pwa-interface
hay-kot Sep 15, 2023
f036708
Revert "translate missing strings"
p0lycarpio Sep 16, 2023
078d0d2
fixes
p0lycarpio Sep 16, 2023
04516bf
Merge branch 'mealie-next' into fix/pwa-interface
p0lycarpio Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/components/Domain/Recipe/RecipeCardMobile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ export default defineComponent({
align-self: start !important;
}

.flat {
.flat, .theme--dark .flat {
box-shadow: none!important;
background-color: transparent;
background-color: transparent!important;
}
</style>
2 changes: 1 addition & 1 deletion frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
:href="recipe.orgURL"
color="secondary darken-1"
target="_blank"
class="rounded-sm mr-4"
class="rounded-sm mr-n2"
>
{{ $t("recipe.original-url") }}
</v-btn>
Expand Down
7 changes: 4 additions & 3 deletions frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
</TransitionGroup>
</draggable>
<v-skeleton-loader v-else boilerplate elevation="2" type="list-item"> </v-skeleton-loader>
<div class="d-flex justify-end mt-2">
<div class="d-flex flex-wrap justify-center justify-sm-end mt-2">
<v-tooltip top color="accent">
<template #activator="{ on, attrs }">
<span v-on="on">
<BaseButton
class="mb-1"
:disabled="recipe.settings.disableAmount || hasFoodOrUnit"
color="accent"
:to="`${recipe.slug}/ingredient-parser`"
Expand All @@ -45,8 +46,8 @@
</template>
<span>{{ parserToolTip }}</span>
</v-tooltip>
<RecipeDialogBulkAdd class="ml-1 mr-1" @bulk-data="addIngredient" />
<BaseButton @click="addIngredient"> {{ $t("general.new") }} </BaseButton>
<RecipeDialogBulkAdd class="mx-1 mb-1" @bulk-data="addIngredient" />
<BaseButton class="mb-1" @click="addIngredient" > {{ $t("general.new") }} </BaseButton>
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</v-app-bar>
<v-hover v-slot="{ hover }">
<v-card
class="ma-1"
class="my-3"
:class="[{ 'on-hover': hover }, isChecked(index)]"
:elevation="hover ? 12 : 2"
:ripple="false"
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/af-ZA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Advanced Search",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/ar-SA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Advanced Search",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/bg-BG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Advanced Search",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/ca-ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Cerca avançada",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/cs-CZ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Stromové zobrazení",
"recipe-yield": "Recipe Yield",
"unit": "Jednotka",
"upload-image": "Nahrát obrázek"
"upload-image": "Nahrát obrázek",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Pokročilé vyhledávání",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/da-DK.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Træ visning",
"recipe-yield": "Udbytte af opskrift",
"unit": "Enhed",
"upload-image": "Upload billede"
"upload-image": "Upload billede",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Avanceret søgning",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Strukturierte Ansicht",
"recipe-yield": "Portionsangabe",
"unit": "Maßeinheit",
"upload-image": "Bild hochladen"
"upload-image": "Bild hochladen",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Erweiterte Suche",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/el-GR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Σύνθετη Αναζήτηση",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/en-GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Advanced Search",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/es-ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Búsqueda avanzada",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/fi-FI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Tarkennettu haku",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/fr-CA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Vue en arborescence",
"recipe-yield": "Nombre de parts",
"unit": "Unité",
"upload-image": "Envoyer une image"
"upload-image": "Envoyer une image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Recherche avancée",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Vue en arborescence",
"recipe-yield": "Nombre de parts",
"unit": "Unité",
"upload-image": "Envoyer une image"
"upload-image": "Envoyer une image",
"add-to-timeline": "Ajouter à l'historique",
"remove-image": "Supprimer l'image",
"screen-awake": "Maintenir l'écran actif",
"timer": {
"kitchen-timer": "Minuteur",
"pause-timer": "Pause",
"resume-timer": "Reprendre",
"start-timer": "Démarrer",
"stop-timer": "Stopper"
}
},
"search": {
"advanced-search": "Recherche avancée",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/gl-ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Advanced Search",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/he-IL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "תצוגת עץ",
"recipe-yield": "תשואת מתכון",
"unit": "יחידה",
"upload-image": "העלה תמונה"
"upload-image": "העלה תמונה",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "חיפוש מתקדם",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/hr-HR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Prikaz Stabla",
"recipe-yield": "Konačna Količina Recepta",
"unit": "Jedinica",
"upload-image": "Učitavanje Slike"
"upload-image": "Učitavanje Slike",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Napredno Pretraživanje",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/hu-HU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Tree View",
"recipe-yield": "Recipe Yield",
"unit": "Unit",
"upload-image": "Upload image"
"upload-image": "Upload image",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Részletes keresés",
Expand Down
12 changes: 11 additions & 1 deletion frontend/lang/messages/it-IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,17 @@
"tree-view": "Visualizzazione ad Albero",
"recipe-yield": "Resa Ricetta",
"unit": "Unità",
"upload-image": "Carica immagine"
"upload-image": "Carica immagine",
"add-to-timeline": "",
"remove-image": "",
"screen-awake": "",
"timer": {
"kitchen-timer": "",
"pause-timer": "",
"resume-timer": "",
"start-timer": "",
"stop-timer": ""
}
},
"search": {
"advanced-search": "Ricerca Avanzata",
Expand Down
Loading