cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

left handed only on mobile

Browse Source
This commit is contained in:
Kaibu
2022-01-21 00:48:57 +01:00
parent c90e5d72af
commit c5b70b94c7
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vue/src/apps/ShoppingListView/ShoppingListView.vue
View File

@ -371,7 +371,8 @@
<div class="row"> <div class="row">
<div class="col col-md-6">{{ $t("mealplan_autoadd_shopping") }}</div> <div class="col col-md-6">{{ $t("mealplan_autoadd_shopping") }}</div>
<div class="col col-md-6 text-right"> <div class="col col-md-6 text-right">
<input type="checkbox" class="form-control settings-checkbox" v-model="settings.mealplan_autoadd_shopping" <input type="checkbox" class="form-control settings-checkbox"
v-model="settings.mealplan_autoadd_shopping"
@change="saveSettings"/> @change="saveSettings"/>
</div> </div>
</div> </div>
@ -384,7 +385,8 @@
<div class="row"> <div class="row">
<div class="col col-md-6">{{ $t("mealplan_autoadd_shopping") }}</div> <div class="col col-md-6">{{ $t("mealplan_autoadd_shopping") }}</div>
<div class="col col-md-6 text-right"> <div class="col col-md-6 text-right">
<input type="checkbox" class="form-control settings-checkbox" v-model="settings.mealplan_autoexclude_onhand" <input type="checkbox" class="form-control settings-checkbox"
v-model="settings.mealplan_autoexclude_onhand"
@change="saveSettings"/> @change="saveSettings"/>
</div> </div>
</div> </div>
@ -398,7 +400,8 @@
<div class="row"> <div class="row">
<div class="col col-md-6">{{ $t("mealplan_autoinclude_related") }}</div> <div class="col col-md-6">{{ $t("mealplan_autoinclude_related") }}</div>
<div class="col col-md-6 text-right"> <div class="col col-md-6 text-right">
<input type="checkbox" class="form-control settings-checkbox" v-model="settings.mealplan_autoinclude_related" <input type="checkbox" class="form-control settings-checkbox"
v-model="settings.mealplan_autoinclude_related"
@change="saveSettings"/> @change="saveSettings"/>
</div> </div>
</div> </div>
@ -583,16 +586,16 @@
<ContextMenu ref="menu"> <ContextMenu ref="menu">
<template #menu="{ contextData }"> <template #menu="{ contextData }">
<ContextMenuItem> <ContextMenuItem>
<b-row class="d-flex align-items-center mr-0">
<b-col cols="6"> <b-input-group>
<a class="dropdown-item p-2" href="#"><i class="fas fa-cubes"></i> {{ $t("MoveCategory") }}</a> <template #prepend>
</b-col> <span class="dropdown-item p-2 text-decoration-none" style="user-select: none!important;"><i class="fas fa-cubes"></i> {{ $t("MoveCategory") }}</span>
<b-col cols="6 pl-1"> </template>
<b-form-select class="form-control form-control-sm" :options="shopping_categories" text-field="name" <b-form-select class="form-control mt-1 mr-1" :options="shopping_categories" text-field="name"
value-field="id" v-model="shopcat" value-field="id" v-model="shopcat"
@change="moveEntry($event, contextData);$refs.menu.close()"></b-form-select> @change="moveEntry($event, contextData);$refs.menu.close()"></b-form-select>
</b-col> </b-input-group>
</b-row>
</ContextMenuItem> </ContextMenuItem>
<ContextMenuItem @click="$refs.menu.close();onHand(contextData)"> <ContextMenuItem @click="$refs.menu.close();onHand(contextData)">
<a class="dropdown-item p-2" href="#"><i class="fas fa-clipboard-check"></i> {{ $t("OnHand") }}</a> <a class="dropdown-item p-2" href="#"><i class="fas fa-clipboard-check"></i> {{ $t("OnHand") }}</a>

21
vue/src/components/ShoppingLineItem.vue
View File

@ -18,7 +18,7 @@
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false" aria-expanded="false"
type="button" type="button"
:class="settings.left_handed ? 'pl-0' : ''" :class="settings.left_handed ? 'dropdown-spacing' : ''"
class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 dropdown-toggle-no-caret"> class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 dropdown-toggle-no-caret">
<i class="fas fa-ellipsis-v fa-lg"></i> <i class="fas fa-ellipsis-v fa-lg"></i>
</button> </button>
@ -31,18 +31,18 @@
</b-col> </b-col>
<b-col cols="8" md="9"> <b-col cols="8" md="9">
<b-row class="d-flex h-100"> <b-row class="d-flex h-100">
<b-col cols="6" md="3" class="d-flex align-items-center" v-if="Object.entries(formatAmount).length == 1"> <b-col cols="5" md="3" class="d-flex align-items-center" v-if="Object.entries(formatAmount).length == 1">
<strong class="mr-1">{{ Object.entries(formatAmount)[0][1] }}</strong> {{ <strong class="mr-1">{{ Object.entries(formatAmount)[0][1] }}</strong> {{
Object.entries(formatAmount)[0][0] Object.entries(formatAmount)[0][0]
}} }}
</b-col> </b-col>
<b-col cols="6" md="3" class="d-flex flex-column" v-if="Object.entries(formatAmount).length != 1"> <b-col cols="5" md="3" class="d-flex flex-column" v-if="Object.entries(formatAmount).length != 1">
<div class="small" v-for="(x, i) in Object.entries(formatAmount)" :key="i">{{ x[1] }} &ensp; <div class="small" v-for="(x, i) in Object.entries(formatAmount)" :key="i">{{ x[1] }} &ensp;
{{ x[0] }} {{ x[0] }}
</div> </div>
</b-col> </b-col>
<b-col cols="6" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2"> <b-col cols="7" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2">
{{ formatFood }} {{ formatFood }}
</b-col> </b-col>
<b-col cols="3" data-html2canvas-ignore="true" <b-col cols="3" data-html2canvas-ignore="true"
@ -110,7 +110,7 @@
aria-haspopup="true" aria-haspopup="true"
aria-expanded="false" aria-expanded="false"
type="button" type="button"
:class="settings.left_handed ? 'pl-0' : ''" :class="settings.left_handed ? 'dropdown-spacing' : ''"
class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 dropdown-toggle-no-caret"> class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 dropdown-toggle-no-caret">
<i class="fas fa-ellipsis-v fa-lg"></i> <i class="fas fa-ellipsis-v fa-lg"></i>
</button> </button>
@ -123,10 +123,10 @@
</b-col> </b-col>
<b-col cols="8" md="9"> <b-col cols="8" md="9">
<b-row class="d-flex align-items-center h-100"> <b-row class="d-flex align-items-center h-100">
<b-col cols="6" md="3" class="d-flex align-items-center"> <b-col cols="5" md="3" class="d-flex align-items-center">
<strong class="mr-1">{{ formatOneAmount(e) }}</strong> {{ formatOneUnit(e) }} <strong class="mr-1">{{ formatOneAmount(e) }}</strong> {{ formatOneUnit(e) }}
</b-col> </b-col>
<b-col cols="6" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2"> <b-col cols="7" md="6" class="align-items-center d-flex pl-0 pr-0 pl-md-2 pr-md-2">
{{ formatOneFood(e) }} {{ formatOneFood(e) }}
</b-col> </b-col>
<b-col cols="12" class="d-flex d-md-none"> <b-col cols="12" class="d-flex d-md-none">
@ -367,4 +367,11 @@ export default {
font-size: 1rem !important; font-size: 1rem !important;
font-weight: 500 !important; font-weight: 500 !important;
} }
@media (max-width: 768px) {
.dropdown-spacing {
padding-left: 0 !important;
padding-right: 0 !important;
}
}
</style> </style>