Skip to content

Open source personal finance application

ui: update

ilkome9f8738bbb174
diff --git a/components/categories/Form.vue b/components/categories/Form.vue
index 468818bc..4a816215 100644
--- a/components/categories/Form.vue
+++ b/components/categories/Form.vue
@@ -163,7 +163,7 @@ async function onSave() {
<template lang="pug">
div
- .pb-8.px-3
+ .pb-8.px-2
UiTabs
UiTabsItem(
:isActive="activeTab === 'data'"
@@ -188,7 +188,7 @@ div
//- Content
//-----------------------------------
- .px-3.max-w-md
+ .px-2.max-w-md
//- Data
//-----------------------------------
template(v-if="activeTab === 'data'")
@@ -265,7 +265,7 @@ div
.p-4 You can not change parent category because edited category has childs categories.
template(v-if="isAllowChangeParent")
- .cursor-pointer.mb-4.py-3.px-3.gap-x-3.flex-center.rounded-md.text-center.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+ .cursor-pointer.mb-4.py-3.px-2.gap-x-3.flex-center.rounded-md.text-center.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
:class="{ '!cursor-default !bg-skin-item-main-active': categoryForm.parentId === 0 }"
@click="emit('updateValue', 'parentId', 0)"
) {{ $t('categories.form.parent.no') }}
diff --git a/components/categories/Item.vue b/components/categories/Item.vue
index 4a34afd4..d9af6a8f 100644
--- a/components/categories/Item.vue
+++ b/components/categories/Item.vue
@@ -45,7 +45,7 @@ export default defineComponent({
</script>
<template lang="pug">
-.cursor-pointer.py-2.px-3.gap-x-3.flex.items-center.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+.cursor-pointer.py-2.px-2.gap-x-3.flex.items-center.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
v-if="category"
:class="{ '!cursor-default !bg-skin-item-main-active': activeItemId === id }"
@click="onClickItem"
diff --git a/components/categories/page/List.vue b/components/categories/page/List.vue
index 1bc0c032..810d0939 100644
--- a/components/categories/page/List.vue
+++ b/components/categories/page/List.vue
@@ -29,14 +29,14 @@ UiPage
UiIconAdd.group-hover_text-white.w-6.h-6
//- List
- .pb-12.px-3
+ .pb-12.px-2
CategoriesList(
:ids="catsIds"
@onClick="catId => $router.push(`/categories/${catId}`)"
)
template(#bottom)
- .pb-4.px-3.flex.justify-evenly.gap-6
+ .pb-4.px-2.flex.justify-evenly.gap-6
//- Create
.cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-sm.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
class="basis-1/2 max-w-[280px]"
diff --git a/components/categories/page/id/Edit.vue b/components/categories/page/id/Edit.vue
index 733b1622..b3a1f7c6 100644
--- a/components/categories/page/id/Edit.vue
+++ b/components/categories/page/id/Edit.vue
@@ -56,24 +56,27 @@ UiPage(v-if="category")
@click='navigate'
)
UiHeaderTitle
- .pb-1.text-xs.font-medium.text-skin-item-base-down
+ .pt-1.text-xs.font-medium.text-skin-item-base-down
| {{ $t('categories.title') }}
template(v-if="parentCategory")
|
| • {{ parentCategory.name }}
- .flex.items-center.gap-4
+ .pb-1.flex.items-center.gap-4
| {{ categoryForm.name }}
- .w-8.h-8.rounded-full.flex-center.text-xl.text-skin-icon-base(:style="{ background: categoryForm.color }")
+ .w-8.h-8.rounded-full.flex-center.text-xl.text-skin-icon-base(
+ :style="{ background: categoryForm.color }"
+ )
div(:class="categoryForm.icon")
template(#actions)
CategoriesDelete(:categoryId="categoryId")
- CategoriesForm(
- :categoryId="categoryId"
- :categoryForm="categoryForm"
- @updateValue="updateValue"
- @afterSave="afterSave"
- )
+ .mt-3
+ CategoriesForm(
+ :categoryId="categoryId"
+ :categoryForm="categoryForm"
+ @updateValue="updateValue"
+ @afterSave="afterSave"
+ )
</template>
diff --git a/components/categories/page/id/Index.vue b/components/categories/page/id/Index.vue
index bfc95322..43ef8e5e 100644
--- a/components/categories/page/id/Index.vue
+++ b/components/categories/page/id/Index.vue
@@ -50,15 +50,17 @@ UiPage(v-if="category")
router-link(v-slot="{ href, navigate }" :to="backLink" custom)
a.grow.hocus_bg-skin-item-main-hover(:href="href" @click="navigate")
UiHeaderTitle
- .pb-1.text-xs.font-medium.text-skin-item-base-down
+ .pt-1.text-xs.font-medium.text-skin-item-base-down
| {{ $t('categories.title') }}
template(v-if="category.parentId")
|
| • {{ $store.state.categories.items[category.parentId].name }}
- .flex.items-center.gap-4
+ .pb-1.flex.items-center.gap-4
| {{ category.name }}
- .w-8.h-8.rounded-full.flex-center.text-xl.text-skin-icon-base(:style="{ background: category.color }")
+ .w-8.h-8.rounded-full.flex-center.text-xl.text-skin-icon-base(
+ :style="{ background: category.color }"
+ )
div(:class="category.icon")
template(#actions v-if="categoryId !== 'transfer'")
@@ -68,9 +70,9 @@ UiPage(v-if="category")
UiIconAdd.group-hover_text-white.w-6.h-6
//- Open stat
- .pb-12
- .px-3.flex
- .cursor-pointer.p-1.px-3.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ .pt-3.mb-12
+ .px-2.flex
+ .cursor-pointer.p-1.px-2.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
class="dark_text-white/60"
@click="handleSetFilterCategory"
)
@@ -79,12 +81,12 @@ UiPage(v-if="category")
.mdi.mdi-chevron-right.opacity-70.text-lg.leading-none
//- Childs categories
- .pb-12(v-if="category.childIds && category.childIds.length > 0")
- .pb-3.flex.gap-2.text-lg.leading-none.font-nunito.font-semibold.text-skin-item-base
+ .mb-12(v-if="category.childIds && category.childIds.length > 0")
+ .pb-3.px-2.flex.gap-2.text-lg.leading-none.font-nunito.font-semibold.text-skin-item-base
div {{ $t('categories.title') }}:
div {{ category.childIds.length }}
- .px-3
+ .px-2
CategoriesList(
:ids="categoryChildIds"
:slider="() => ({})"
@@ -93,7 +95,7 @@ UiPage(v-if="category")
)
//- History
- .px-3
+ .px-2
TrnsHistory(
:trnsIds="trnsIds"
:trnType="filter.trnType"
diff --git a/components/currencies/List.vue b/components/currencies/List.vue
index 14b9034c..572a88c6 100644
--- a/components/currencies/List.vue
+++ b/components/currencies/List.vue
@@ -26,7 +26,7 @@ const list = computed(() => {
.overflow-hidden.h-full.grid(
class="grid-rows-[auto,1fr]"
)
- .pb-2.px-3
+ .pb-2.px-2
input.w-full.m-0.py-2.px-3.rounded-lg.text-base.font-normal.text-skin-item-base.bg-skin-item-main-bg.border.border-solid.border-skin-item-main-hover.placeholder_text-skin-item-base-down.transition.ease-in-out.focus_text-skin-item-base-up.focus_bg-skin-item-main-hover.focus_border-blue3.focus_outline-none(
placeholder="Search..."
v-model="searchInput"
diff --git a/components/currencies/Modal.vue b/components/currencies/Modal.vue
index 9cf340a0..a0d4b7ab 100644
--- a/components/currencies/Modal.vue
+++ b/components/currencies/Modal.vue
@@ -27,7 +27,7 @@ Portal(
BaseBottomSheetClose(@onClick="close")
template(#header)
- .py-4.px-3.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold.bg-skin-layout-main.rounded-t-2xl
+ .py-4.px-2.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold.bg-skin-layout-main.rounded-t-2xl
| {{ $t('currency.selectBaseTitle') }}
template(#default="{ close }")
diff --git a/components/date/Selector.vue b/components/date/Selector.vue
index a7a99a0b..bd473978 100644
--- a/components/date/Selector.vue
+++ b/components/date/Selector.vue
@@ -77,7 +77,7 @@ Portal(to="modal")
@click="onSelectPeriodCount(maxPeriodsNumber, close)"
) {{ maxPeriodsNumber }}
- .pb-4.px-3.flex.justify-evenly.gap-6
+ .pb-4.px-2.flex.justify-evenly.gap-6
.cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-sm.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
class="basis-1/2 max-w-[280px]"
@click="close()"
diff --git a/components/modal/ModalBottomConfirm.vue b/components/modal/ModalBottomConfirm.vue
index 82484039..c29c2da3 100644
--- a/components/modal/ModalBottomConfirm.vue
+++ b/components/modal/ModalBottomConfirm.vue
@@ -26,7 +26,7 @@ Portal(
template(#default="{ closeModal }")
.pb-8.text-skin-red-base.text-center(v-if="description") {{ description }}
- .pb-4.px-3.flex.justify-evenly.gap-6
+ .pb-4.px-2.flex.justify-evenly.gap-6
ModalButton.grow(
:name="$t('base.no')"
icon="mdi mdi-close"
diff --git a/components/stat/laptop/View.vue b/components/stat/laptop/View.vue
index 3ae8cbc3..c6b133a9 100644
--- a/components/stat/laptop/View.vue
+++ b/components/stat/laptop/View.vue
@@ -64,7 +64,7 @@ onDeactivated(async () => {
)
| {{ $store.state.currencies.base }}
- .pb-6.px-3(v-if="walletsCurrencies.length > 1")
+ .pb-6.px-2(v-if="walletsCurrencies.length > 1")
WalletsCurrenciesChanger
.mx-2.mb-4.rounded-lg.bg-skin-item-main-bg.border.dark_border-neutral-800
diff --git a/components/trnForm/ModalWallets.vue b/components/trnForm/ModalWallets.vue
index f6c731ad..945a4faa 100644
--- a/components/trnForm/ModalWallets.vue
+++ b/components/trnForm/ModalWallets.vue
@@ -23,12 +23,12 @@ BaseBottomSheet(
BaseBottomSheetClose(@onClick="close")
template(#header)
- .py-4.px-3.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold.bg-skin-layout-main.rounded-t-2xl
+ .py-4.px-2.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold.bg-skin-layout-main.rounded-t-2xl
| {{ title }}
template(#default="{ close }")
WalletsList(#default="{ walletsItemsSorted }")
- .pb-3.px-3.grid.gap-1
+ .pb-3.px-2.grid.gap-1
//- Wallet
.cursor-pointer.flex.items-center.py-2.px-3.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
v-for="(walletItem, walletId) in walletsItemsSorted"
diff --git a/components/trnForm/Selected.vue b/components/trnForm/Selected.vue
index ab0cf121..0332ab73 100644
--- a/components/trnForm/Selected.vue
+++ b/components/trnForm/Selected.vue
@@ -1,5 +1,5 @@
<template lang="pug">
-.px-3.pb-6.grid.grid-cols-2.gap-3(
+.px-2.pb-6.grid.grid-cols-2.gap-3(
v-show="$store.state.trnForm.values.amountType !== 2"
)
TrnFormSelectedWallet(
diff --git a/components/trns/list/TrnsListHistory.vue b/components/trns/list/TrnsListHistory.vue
index d578d744..715952cd 100644
--- a/components/trns/list/TrnsListHistory.vue
+++ b/components/trns/list/TrnsListHistory.vue
@@ -140,7 +140,7 @@ div
:trnId="trnId"
)
- .py-4.pb-6.px-3.flex-center(v-if="!isShowedAllTrns")
+ .py-4.pb-6.px-2.flex-center(v-if="!isShowedAllTrns")
.cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-sm.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
class="basis-1/2 max-w-[280px]"
@click="showMoreTrns"
diff --git a/components/trns/pages/History.vue b/components/trns/pages/History.vue
index f680c7f8..6df53e0f 100644
--- a/components/trns/pages/History.vue
+++ b/components/trns/pages/History.vue
@@ -40,10 +40,10 @@ export default defineComponent({
<template lang="pug">
.h-full.overflow.overflow-x-auto
- .py-6.px-3.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ .py-6.px-2.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
| {{ $t('trns.history') }}
- .px-3
+ .px-2
.pb-8(v-if="statPage.filter.isShow")
LazyStatFilter
diff --git a/components/ui/Header.vue b/components/ui/Header.vue
index f479ff47..d3135d88 100644
--- a/components/ui/Header.vue
+++ b/components/ui/Header.vue
@@ -3,7 +3,7 @@
</script>
<template lang="pug">
-.flex.px-2.flex.items-center.justify-between.gap-4.sticky.top-0.z-20.backdrop-blur(
+.flex.flex.items-center.justify-between.gap-4.sticky.top-0.z-20.backdrop-blur(
class="bg-white/70 dark_bg-dark3/70"
)
slot
diff --git a/components/ui/HeaderTitle.vue b/components/ui/HeaderTitle.vue
index 42a2d1fe..ea7875be 100644
--- a/components/ui/HeaderTitle.vue
+++ b/components/ui/HeaderTitle.vue
@@ -3,6 +3,6 @@
</script>
<template lang="pug">
-.grow.py-1.px-3.font-nunito.text-neutral-800.dark_text-white.text-xl.leading-none.font-semibold
+.grow.py-1.px-2.font-nunito.text-neutral-800.dark_text-white.text-xl.leading-none.font-semibold
slot
</template>
diff --git a/components/wallets/Form.vue b/components/wallets/Form.vue
index f9c2919d..86f412ea 100644
--- a/components/wallets/Form.vue
+++ b/components/wallets/Form.vue
@@ -89,7 +89,7 @@ function onSave() {
<template lang="pug">
div(v-if="walletForm")
- .pb-8.px-3
+ .pb-8.px-2
UiTabs
UiTabsItem(
:isActive="activeTab === 'data'"
@@ -108,7 +108,7 @@ div(v-if="walletForm")
//- Content
//-----------------------------------
- .px-3.max-w-md
+ .px-2.max-w-md
//- Data
//-----------------------------------
template(v-if="activeTab === 'data'")
diff --git a/components/wallets/Sort.vue b/components/wallets/Sort.vue
index 68e1a595..aea876b4 100644
--- a/components/wallets/Sort.vue
+++ b/components/wallets/Sort.vue
@@ -47,7 +47,7 @@ export default {
.h-full.overflow.overflow-x-auto.bg-skin-layout-main
//- Header
//-----------------------------------
- .pb-4.px-3.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold
+ .pb-4.px-2.text-center.text-skin-item-base.text-xl.font-nunito.font-semibold
| {{ $t('wallets.sortTitle') }}
//- Items
diff --git a/components/wallets/Total.vue b/components/wallets/Total.vue
index 3d4c7949..f74cb768 100644
--- a/components/wallets/Total.vue
+++ b/components/wallets/Total.vue
@@ -68,7 +68,7 @@ const counts = computed(() => ({
</script>
<template lang="pug">
-.px-3.py-1.bg-skin-item-main-bg.rounded-md(
+.px-2.py-1.bg-skin-item-main-bg.rounded-md(
v-if="$store.getters['wallets/hasWallets']"
)
template(v-for="item in counts")
diff --git a/components/wallets/page/List.vue b/components/wallets/page/List.vue
index dbbf038c..8d210e4e 100644
--- a/components/wallets/page/List.vue
+++ b/components/wallets/page/List.vue
@@ -27,14 +27,14 @@ UiPage
UiHeaderLink(@click="$router.push('/wallets/new')")
UiIconAdd.w-5.h-5.group-hover_text-white
- .pb-6.px-3(v-if="walletsCurrencies.length > 1")
+ .pb-6.px-2(v-if="walletsCurrencies.length > 1")
WalletsCurrenciesChanger
- .pb-12.px-3
+ .pb-12.px-2
WalletsTotal
//- Total
- .pb-4.px-3(v-if="$store.getters['user/isDevUser']")
+ .pb-4.px-2(v-if="$store.getters['user/isDevUser']")
.flex
.cursor-pointer.p-1.px-3.flex.items-center.gap-3.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
@click="$router.push('/wallets/total')"
@@ -46,7 +46,7 @@ UiPage
//- List
//---------------------------------
WalletsList(#default="{ walletsItemsSorted }")
- .pb-12.px-3.grid.gap-y-1.gap-x-6.md_grid-cols-2
+ .pb-12.px-2.grid.gap-y-1.gap-x-6.md_grid-cols-2
//- Wallet
.cursor-pointer.flex.items-center.py-2.px-3.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
v-for="(walletItem, walletId) in walletsItemsSorted"
@@ -76,7 +76,7 @@ UiPage
)
template(#bottom)
- .pb-4.px-3.flex.justify-evenly.gap-6
+ .pb-4.px-2.flex.justify-evenly.gap-6
//- Sort
.cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-sm.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
class="basis-1/2 max-w-[280px]"
diff --git a/components/wallets/page/id/Index.vue b/components/wallets/page/id/Index.vue
index cf5b9346..c379e7f7 100644
--- a/components/wallets/page/id/Index.vue
+++ b/components/wallets/page/id/Index.vue
@@ -58,27 +58,27 @@ UiPage(v-if="wallet")
router-link(v-slot="{ href, navigate }" to="/wallets" custom)
a.grow.hocus_bg-skin-item-main-hover(:href="href" @click="navigate")
UiHeaderTitle
- .pb-1.text-xs.font-medium.text-skin-item-base-down
+ .pt-1.text-xs.font-medium.text-skin-item-base-down
| {{ $t("wallets.title") }}
- .flex.items-center.gap-3.pb-4
+ .pb-1.flex.items-center.gap-3
.text-skin-item-base-up.text-2xl.font-semibold
| {{ wallet.name }}
.p-1.flex-center.rounded.text-skin-icon-base.text-2xs(:style="{ background: wallet.color }")
| {{ wallet.currency }}
- .flex.text-3xl.font-normal
- Amount(
- :amount="total"
- :currencyCode="wallet.currency"
- )
-
template(#actions)
UiHeaderLink(@click="handleEditClick")
.mdi.mdi-pencil-outline.group-hover_text-white.text-xl
- .pb-6
- .px-3.flex
+ .mb-6.pt-3.px-2.flex.text-3xl.font-normal
+ Amount(
+ :amount="total"
+ :currencyCode="wallet.currency"
+ )
+
+ .mb-6
+ .px-2.flex
.cursor-pointer.p-1.px-3.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
class="dark_text-white/60"
@click="handleSetFilterWallet"
@@ -101,7 +101,7 @@ UiPage(v-if="wallet")
)
//- History
- .px-3
+ .px-2
TrnsHistory(
:trnsIds="trnsIds"
:trnType="filter.trnType"
diff --git a/components/welcome/WalletForm.vue b/components/welcome/WalletForm.vue
index 543978bb..453c492c 100644
--- a/components/welcome/WalletForm.vue
+++ b/components/welcome/WalletForm.vue
@@ -35,7 +35,7 @@ export default defineComponent({
<template lang="pug">
UiPage
- .mb-3.py-5.px-3.font-nunito
+ .mb-3.py-5.px-2.font-nunito
.pb-1.text-xs.font-medium.text-skin-item-base-down
| {{ $t("wallets.createNewTitle") }}