1
0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-11 17:16:59 -05:00

Merge pull request #2727 from jrester/dark-theme-fixes

Improve dark theme
This commit is contained in:
vabene1111
2023-11-27 20:05:30 +01:00
committed by GitHub
11 changed files with 178 additions and 94 deletions

View File

@@ -56,7 +56,7 @@
</div>
<bottom-navigation-bar>
<bottom-navigation-bar active-view="view_books">
<template #custom_create_functions>
<div class="dropdown-divider" ></div>
<h6 class="dropdown-header">{{ $t('Books')}}</h6>

View File

@@ -230,7 +230,7 @@
:current_period="current_period"
></auto-meal-plan-modal>
<bottom-navigation-bar :create_links="[{label:$t('Export_To_ICal'), url: iCalUrl, icon:'fas fa-download'}]">
<bottom-navigation-bar active-view="view_plan" :create_links="[{label:$t('Export_To_ICal'), url: iCalUrl, icon:'fas fa-download'}]">
<template #custom_create_functions>
<h6 class="dropdown-header">{{ $t('Meal_Plan') }}</h6>
<a class="dropdown-item" @click="createEntryClick(new Date())"><i
@@ -796,4 +796,8 @@ having to override as much.
font-size: 18px !important;
}
}
.b-calendar-grid-help {
padding: 0.25rem;
}
</style>

View File

@@ -425,6 +425,7 @@
v-if="!ingredient.is_header">
<input
class="form-control"
style="height: 100%;"
v-model="ingredient.amount"
type="number"
step="any"
@@ -506,6 +507,7 @@
<input
class="form-control"
maxlength="256"
style="height: 100%;"
v-model="ingredient.note"
v-bind:placeholder="$t('Note')"
v-on:keydown.tab="
@@ -689,7 +691,7 @@
<br/>
<!-- bottom buttons save/close/view -->
<div class="row fixed-bottom p-2 b-2 border-top text-center" style="background: white"
<div class="row fixed-bottom p-2 b-2 border-top text-center bg-white bottom-action-bar"
v-if="recipe !== undefined">
<div class="col-3 col-md-6 mb-1 mb-md-0 pr-2 pl-2">
<a :href="resolveDjangoUrl('delete_recipe', recipe.id)"

View File

@@ -846,7 +846,7 @@
<meal-plan-edit-modal :entry="mealplan_entry_edit" :create_date="mealplan_default_date"></meal-plan-edit-modal>
<bottom-navigation-bar></bottom-navigation-bar>
<bottom-navigation-bar active-view="view_search"></bottom-navigation-bar>
</div>
</div>
</div>

View File

@@ -2,7 +2,7 @@
<div id="app" v-if="recipe_id !== undefined">
<recipe-view-component :recipe_id="recipe_id"></recipe-view-component>
<bottom-navigation-bar></bottom-navigation-bar>
<bottom-navigation-bar active-view="view_search"></bottom-navigation-bar>
</div>
</template>

View File

@@ -566,7 +566,7 @@
<shopping-modal v-if="new_recipe.id" :recipe="new_recipe" :servings="parseInt(add_recipe_servings)"
:modal_id="new_recipe.id" @finish="finishShopping" :list_recipe="new_recipe.list_recipe"/>
<bottom-navigation-bar>
<bottom-navigation-bar active-view="view_shopping">
<template #custom_create_functions>
<div class="dropdown-divider"></div>