Skip to content

Open source personal finance application

refactor: improve component styles and layout consistency

Ilya Komichevdd293e09766a
diff --git a/app/assets/css/tailwind.css b/app/assets/css/tailwind.css
index 30932a83..9fa6f5de 100644
--- a/app/assets/css/tailwind.css
+++ b/app/assets/css/tailwind.css
@@ -31,7 +31,7 @@
}
.pageWrapper {
- @apply max-w-xl grow px-2 lg:px-4 2xl:px-8;
+ @apply @xl/page:max-w-2xl grow px-2 lg:px-4 2xl:px-8;
}
.bottomSheetDrugClassesCustom {
diff --git a/app/components/amount/Amount.vue b/app/components/amount/Amount.vue
index d555250c..7b240660 100644
--- a/app/components/amount/Amount.vue
+++ b/app/components/amount/Amount.vue
@@ -44,7 +44,7 @@ const { baseCurrencyCode, getAmountInBaseRate } = useAmount()
'text-xl': props.variant === 'xl',
'text-base': props.variant === 'base',
}"
- class="font-secondary text-1 grid gap-1 leading-none"
+ class="grid gap-1 font-secondary leading-none text-1"
@click="(e: Event) => emit('click', e)"
>
<AmountItem
diff --git a/app/components/categories/Header.vue b/app/components/categories/Header.vue
index 2e563bb6..bef7dc2d 100644
--- a/app/components/categories/Header.vue
+++ b/app/components/categories/Header.vue
@@ -32,14 +32,14 @@ function onParentClick() {
<div
v-if="props.parentCategory"
- class="@lg:text-base text-item-2 flex items-center pt-[3px] text-xs font-medium leading-none"
+ class="@lg:text-base flex items-center pt-[3px] text-xs font-medium leading-none text-item-2"
>
<div class="text-2xs text-4">
•
</div>
<div
- class="hocus:bg-item-5 flex items-center gap-2 rounded-lg px-3 py-1"
+ class="flex items-center gap-2 rounded-lg px-3 py-1 hocus:bg-item-5"
@click="onParentClick"
>
{{ props.parentCategory.name }}
diff --git a/app/components/categories/Item.vue b/app/components/categories/Item.vue
index b4859058..ab40e6a6 100644
--- a/app/components/categories/Item.vue
+++ b/app/components/categories/Item.vue
@@ -9,6 +9,7 @@ export type CategoryItemProps = {
category: CategoryItem
categoryId: CategoryId
class?: string
+ insideClasses?: string
isShowDots?: boolean
isShowParent?: boolean
lineWidth?: number
@@ -34,7 +35,7 @@ const parentCategory = computed(() => categoriesStore.items[props.category?.pare
:isActive="props.activeItemId === props.categoryId"
:class="props.class"
:lineWidth="props.lineWidth"
- insideClasses="min-h-[46px]"
+ :insideClasses="`min-h-[46px] ${props.insideClasses}`"
@click="(e: Event) => emit('click', e)"
>
<template #leftIcon>
diff --git a/app/components/categories/List.vue b/app/components/categories/List.vue
index 82bd6101..16e92914 100644
--- a/app/components/categories/List.vue
+++ b/app/components/categories/List.vue
@@ -4,10 +4,11 @@ import type { CategoryId } from '~/components/categories/types'
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
-defineProps<{
+const props = defineProps<{
activeItemId?: string | 0 | false | null
categoriesItemProps?: Partial<CategoryItemProps>
ids: CategoryId[]
+ insideClasses?: string
slider?: object
}>()
@@ -28,6 +29,7 @@ const categoriesStore = useCategoriesStore()
:category="categoriesStore.items[categoryId]"
:categoryId="categoryId"
:slider="slider"
+ :insideClasses="props.insideClasses"
:lineWidth="1"
isShowDots
v-bind="categoriesItemProps"
diff --git a/app/components/categories/page/List.vue b/app/components/categories/page/List.vue
index 8ae3b87b..54b63f6d 100644
--- a/app/components/categories/page/List.vue
+++ b/app/components/categories/page/List.vue
@@ -9,6 +9,8 @@ useHead({
})
const router = useRouter()
const categoriesStore = useCategoriesStore()
+
+const categoriesView = ref<'list' | 'grid'>('list')
</script>
<template>
@@ -16,6 +18,13 @@ const categoriesStore = useCategoriesStore()
<UiHeader>
<UiHeaderTitle>{{ t('categories.name') }}</UiHeaderTitle>
<template #actions>
+ <UiItem3 @click="categoriesView = categoriesView === 'list' ? 'grid' : 'list'">
+ <Icon
+ :name="categoriesView === 'list' ? 'lucide:layout-grid' : 'lucide:list'"
+ size="20"
+ />
+ </UiItem3>
+
<UiItem3 @click="router.push('/categories/new')">
<Icon name="lucide:plus" size="24" />
</UiItem3>
@@ -39,13 +48,18 @@ const categoriesStore = useCategoriesStore()
<!-- List -->
<div
v-else
- class="pageWrapper"
+ class="max-w-4xl grow px-2 lg:px-4 2xl:px-8"
>
<CategoriesList
:ids="categoriesStore.categoriesRootIds"
:categoriesItemProps="{
class: 'group',
+ lineWidth: categoriesView === 'list' ? 1 : 0,
+ }"
+ :class="{
+ '@2xl/page:grid-cols-3 @sm:grid-cols-2 grid gap-1.5': categoriesView === 'grid',
}"
+ :insideClasses="categoriesView === 'grid' ? 'bg-item-9' : ''"
@click="(categoryId: CategoryId) => router.push(`/categories/${categoryId}`)"
/>
</div>
diff --git a/app/components/color/Palette.vue b/app/components/color/Palette.vue
index 0aabee83..e744d953 100644
--- a/app/components/color/Palette.vue
+++ b/app/components/color/Palette.vue
@@ -66,7 +66,7 @@ function findWalletWithColor(color: string) {
</template>
<input
:value="activeColor"
- class="h-12 w-full rounded-lg border border-solid border-item-5 p-0 transition ease-in-out focus:border-accent-4 focus:bg-item-5 focus:text-item-1 focus:outline-none"
+ class="h-12 w-full rounded-lg border border-solid border-item-5 p-0 transition ease-in-out focus:border-accent-4 focus:bg-item-5 focus:text-1 focus:outline-none"
type="color"
@input="(event: HTMLInputEvent) => emit('click', event.target.value)"
>
diff --git a/app/components/date/LinkItem.vue b/app/components/date/LinkItem.vue
index 3bf5dd8f..91177465 100644
--- a/app/components/date/LinkItem.vue
+++ b/app/components/date/LinkItem.vue
@@ -17,7 +17,7 @@ const emit = defineEmits<{
'_!bg-item-5 text-accent-1': props.isActive,
},
]"
- class="font-primary text-nowrap rounded-full text-xs leading-none"
+ class="text-nowrap rounded-full font-primary text-xs leading-none"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index a2dc9200..0ccf054f 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -59,11 +59,11 @@ const isShowLogoMenu = ref(false)
</div>
</template>
- <template #content="{ close }">
+ <template #content>
<div class="grid gap-2 px-1 py-3 md:px-3 md:!pb-0">
<AppLocaleSwitcher />
- <div class="bg-item-3 h-px" />
+ <div class="h-px bg-item-3" />
<AppThemeSwitcher
isShowSystem
@@ -86,7 +86,7 @@ const isShowLogoMenu = ref(false)
<LayoutSidebarMenu class="px-2 pb-2" />
<div class="px-2 pb-6">
- <UiTitle3 class="!text-4 pb-2 pl-3">
+ <UiTitle3 class="pb-2 pl-3 !text-4">
{{ t('wallets.title') }}
</UiTitle3>
@@ -123,7 +123,7 @@ const isShowLogoMenu = ref(false)
<div class="absolute bottom-1 left-1 hidden w-full items-center md:flex">
<UiItem1
- class="bg-foreground-2 text-4 z-10"
+ class="z-10 bg-foreground-2 text-4"
@click="emit('toggleSidebar')"
>
<Icon :name="props.isShowSidebar ? 'lucide:panel-left-close' : 'lucide:panel-left'" size="18" />
diff --git a/app/components/layout/SidebarMenuItem.vue b/app/components/layout/SidebarMenuItem.vue
index 386b5412..9f8df98e 100644
--- a/app/components/layout/SidebarMenuItem.vue
+++ b/app/components/layout/SidebarMenuItem.vue
@@ -23,7 +23,7 @@ const { checkIsActive, onClick } = useMenuData()
'gap-3': props.isShowText,
},
]"
- class="text-2 group"
+ class="group text-2"
@click="onClick(props.menuId)"
>
<div class="flex min-w-8 items-center justify-center">
diff --git a/app/components/stat/CategoriesButtons.vue b/app/components/stat/CategoriesButtons.vue
index a8917d79..df10611a 100644
--- a/app/components/stat/CategoriesButtons.vue
+++ b/app/components/stat/CategoriesButtons.vue
@@ -201,7 +201,7 @@ const isShow = ref(false)
>
<template #trigger>
<UiItem1
- class="group-data-[headlessui-state='open']:!border-accent-1 border border-transparent"
+ class="border border-transparent group-data-[headlessui-state='open']:!border-accent-1"
>
<Icon name="lucide:circle-ellipsis" size="20" />
</UiItem1>
@@ -210,7 +210,7 @@ const isShow = ref(false)
<template #content="{ close }">
<div class="grid min-w-80 gap-4 px-1 pt-3 md:px-3">
<BottomSheetClose @click="close" />
- <div class="border-item-3 grid gap-4 border-b pb-3">
+ <div class="grid gap-4 border-b border-item-3 pb-3">
<!-- Grouping -->
<div class="grid gap-3">
<UiTitleOption>
@@ -280,7 +280,7 @@ const isShow = ref(false)
<!-- List -->
<div
v-if="statConfig.config.value.catsView === 'list'"
- class="border-item-3 grid gap-3 border-b pb-2 last:border-0"
+ class="grid gap-3 border-b border-item-3 pb-2 last:border-0"
>
<UiTitleOption>{{ t('listItemsOptions') }}</UiTitleOption>
<div class="flex gap-1">
@@ -362,7 +362,7 @@ const isShow = ref(false)
<!-- Vertical -->
<div
v-if="props.catsLength > 1"
- class="border-item-3 grid border-b pb-2 last:border-0 md:pb-0"
+ class="grid border-b border-item-3 pb-2 last:border-0 md:pb-0"
>
<UiTitleOption class="pb-2">
{{ t('stat.config.categories.vertical.label') }}
@@ -418,7 +418,7 @@ const isShow = ref(false)
<!-- TODO: use StatConfig -->
<div
v-if="false"
- class="border-item-3 border-b pb-2 last:border-0 last:pb-0"
+ class="border-b border-item-3 pb-2 last:border-0 last:pb-0"
>
<!-- Favorite -->
<UiElement
diff --git a/app/components/stat/Header.vue b/app/components/stat/Header.vue
index 004a1afb..ad8579c1 100644
--- a/app/components/stat/Header.vue
+++ b/app/components/stat/Header.vue
@@ -75,7 +75,7 @@ function onClickWallet(walletId: WalletId) {
<template #after>
<div
v-if="props.menu"
- class="px-2 sm:pb-4 md:pt-2 lg:px-4 2xl:px-8"
+ class="px-2 sm:pb-1 md:pt-2 lg:px-4 2xl:px-8"
>
<StatMenu
:active="props.menu.active"
diff --git a/app/components/stat/categories/Section.vue b/app/components/stat/categories/Section.vue
index bb3670ad..e3290973 100644
--- a/app/components/stat/categories/Section.vue
+++ b/app/components/stat/categories/Section.vue
@@ -252,7 +252,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="border-item-5 ml-5 mt-[-2px] -translate-x-px border-l pl-3">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-5 pl-3">
<div
v-if="!item.categories || item.categories.length === 0"
class="mb-3 ml-11"
@@ -317,7 +317,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="border-item-5 ml-5 mt-[-2px] -translate-x-px border-l pl-14">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-5 pl-14">
<TrnsList
:trnsIds="itemInside.trnsIds"
:size="5"
diff --git a/app/components/stat/chart/Intervals.vue b/app/components/stat/chart/Intervals.vue
index cf711c28..8c372efd 100644
--- a/app/components/stat/chart/Intervals.vue
+++ b/app/components/stat/chart/Intervals.vue
@@ -42,7 +42,7 @@ const items = computed(() => {
<template>
<div
v-if="items.length > 1"
- class="border-item-3 flex min-h-8 gap-0 border-l pl-2"
+ class="flex min-h-8 gap-0 pl-2"
>
<StatChartButton
v-for="item in items"
diff --git a/app/components/stat/chart/Wrap.vue b/app/components/stat/chart/Wrap.vue
index 40c6f470..69250348 100644
--- a/app/components/stat/chart/Wrap.vue
+++ b/app/components/stat/chart/Wrap.vue
@@ -62,11 +62,11 @@ function onChangePeriod(period: Period) {
>
<div class="flex justify-end">
<slot />
- <!-- <StatChartTypeSelector
- :chartType="statConfig.config.value?.chartType"
- @click="(value: ChartType) => statConfig.updateConfig('chartType', value)"
- /> -->
+
<StatChartIntervals
+ :class="{
+ 'border-l border-item-3': statConfig.config.value?.date.isShowQuick,
+ }"
:period="statDate.params.value.intervalsBy"
:range="statDate.range.value"
@onChangePeriod="onChangePeriod"
diff --git a/app/components/trnForm/Main.vue b/app/components/trnForm/Main.vue
index 656b1c83..6abe821e 100644
--- a/app/components/trnForm/Main.vue
+++ b/app/components/trnForm/Main.vue
@@ -96,7 +96,7 @@ const actions = computed(() => ({
/>
<UiTitle3
- class="bg-foreground-1 sticky top-0 z-10 px-3 pb-3 pt-4 md:text-xl"
+ class="sticky top-0 z-10 bg-foreground-1 px-3 pb-3 pt-4 md:text-xl"
@click="trnsFormStore.values.trnId = null"
>
{{ trnsFormStore.values.trnId ? t("trnForm.titleEditTrn") : t("trnForm.createTrn") }}
@@ -108,7 +108,7 @@ const actions = computed(() => ({
>
<TrnsItem
:trnItem="trnsStore.computeTrnItem(trnsFormStore.values.trnId)"
- class="bg-item-4 group rounded-lg"
+ class="group rounded-lg bg-item-4"
@click="trnsFormStore.values.trnId = null"
/>
@@ -116,7 +116,7 @@ const actions = computed(() => ({
v-if="showModalConfirm"
class="absolute -bottom-4 left-0 z-10 w-full px-4"
>
- <div class="border-accent-1 bg-foreground-1 text-1 z-10 grid h-full content-center gap-4 rounded-lg border p-3">
+ <div class="z-10 grid h-full content-center gap-4 rounded-lg border border-accent-1 bg-foreground-1 p-3 text-1">
{{ t('base.sure') }}
<div class="flex gap-2">
@@ -134,7 +134,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="text-2 leading-none">
+ <div class="leading-none text-2">
{{ t(item.localeKey) }}
</div>
</UiElement>
@@ -156,7 +156,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="text-2 leading-none">
+ <div class="leading-none text-2">
{{ t(item.localeKey) }}
</div>
</DateLinkItem>
diff --git a/app/components/trnForm/TrnsSlide.vue b/app/components/trnForm/TrnsSlide.vue
index 9a31772b..882ac1ea 100644
--- a/app/components/trnForm/TrnsSlide.vue
+++ b/app/components/trnForm/TrnsSlide.vue
@@ -93,7 +93,7 @@ const tabs = computed<{ id: FilterBy, name: string }[]>(() => [
<UiTabsItem1
v-for="tab in tabs"
:key="tab.id"
- class="whitespace-nowrap"
+ class="whitespace-nowrap text-xs"
:isActive="tab.id === filterBy"
@click="changeFilter(tab.id)"
>
diff --git a/app/components/trnForm/main/AmountTransfer.vue b/app/components/trnForm/main/AmountTransfer.vue
index 77b400ec..317103ca 100644
--- a/app/components/trnForm/main/AmountTransfer.vue
+++ b/app/components/trnForm/main/AmountTransfer.vue
@@ -68,7 +68,7 @@ watch(
:class="[getStyles('item', ['bg2', 'link', 'rounded']), {
'bg-item-5': trnsFormStore.values.transferType === item.transferType,
}]"
- class=" text-1/70 flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm lg:min-h-[42px]"
+ class=" flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm text-1/70 lg:min-h-[42px]"
>
{{ t(slug) }}
</div>
diff --git a/app/components/trnForm/main/CalculatorButton.vue b/app/components/trnForm/main/CalculatorButton.vue
index 6aa5042f..f1c3dca5 100644
--- a/app/components/trnForm/main/CalculatorButton.vue
+++ b/app/components/trnForm/main/CalculatorButton.vue
@@ -8,17 +8,17 @@ const emit = defineEmits<{
<div
class="
@xs/trnForm:w-14 @sm/trnForm:w-16
- bg-item-4 font-secondary text-2
- hocus:scale-[1.02]
- hocus:border-item-6
- hocus:bg-item-5
flex aspect-square w-12
items-center
justify-center
- rounded-full p-1
+ rounded-full
+ bg-item-4 p-1 font-secondary
text-2xl
font-normal
- transition
+ text-2 transition
+ hocus:scale-[1.02]
+ hocus:border-item-6
+ hocus:bg-item-5
"
tabindex="0"
@click="() => emit('click')"
diff --git a/app/components/trnForm/main/Input.vue b/app/components/trnForm/main/Input.vue
index d5c30d2d..cf4a7f38 100644
--- a/app/components/trnForm/main/Input.vue
+++ b/app/components/trnForm/main/Input.vue
@@ -24,9 +24,9 @@ const { t } = useI18n()
'left-1/2 -translate-x-1/2': !isTransfer,
}]"
class="
- text-1/60
- pointer-events-none absolute
- top-2 text-center text-sm
+ pointer-events-none
+ absolute top-2
+ text-center text-sm text-1/60
"
tabindex="0"
>
@@ -41,7 +41,7 @@ const { t } = useI18n()
}"
:placeholder="t('enterAmount')"
:value="amountRaw"
- class="swiper-no-swiping bg-item-9 font-secondary focus:!border-accent-3 border-transparent pb-2 pt-6 text-center !text-3xl placeholder:text-3xl"
+ class="swiper-no-swiping border-transparent bg-item-9 pb-2 pt-6 text-center font-secondary !text-3xl placeholder:text-3xl focus:!border-accent-3"
inputmode="tel"
@updateValue="(value: string) => emit('onChange', value || '')"
/>
diff --git a/app/components/trns/Item.vue b/app/components/trns/Item.vue
index 05e5d1b4..926e71a8 100644
--- a/app/components/trns/Item.vue
+++ b/app/components/trns/Item.vue
@@ -37,7 +37,7 @@ const { t } = useI18n()
<template v-if="alt">
<div
v-if="date"
- class="text-2xs min-w-10 truncate leading-none"
+ class="min-w-10 truncate text-2xs leading-none"
>
{{ date }}
</div>
@@ -51,7 +51,7 @@ const { t } = useI18n()
:color="props.trnItem.category?.color"
size="16"
/>
- <div class="text-2 flex items-center gap-2 text-xs leading-none">
+ <div class="flex items-center gap-2 text-xs leading-none text-2">
{{ trnItem.category.name }}
</div>
</div>
@@ -65,7 +65,7 @@ const { t } = useI18n()
>
<div
v-if="!alt"
- class="text-3 grid grow gap-0.5"
+ class="grid grow gap-0.5 text-3"
>
<CategoriesName
v-if="trnItem.type !== TrnType.Transfer"
@@ -79,7 +79,7 @@ const { t } = useI18n()
v-if="trnItem.wallet"
class="flex items-center gap-2"
>
- <div class="text-4 text-xs leading-none">
+ <div class="text-xs leading-none text-4">
{{ trnItem.wallet.name }}
</div>
</div>
diff --git a/app/components/trns/List.vue b/app/components/trns/List.vue
index 648afd7f..d5fad1c4 100644
--- a/app/components/trns/List.vue
+++ b/app/components/trns/List.vue
@@ -209,7 +209,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
<!-- Group Sum -->
<div
v-if="isShowGroupSum && paginatedTrnsIds.length > 1"
- class="border-item-5 border-b pb-2 pr-3"
+ class="border-b border-item-5 pb-2 pr-3"
>
<Amount
v-if="getTotalOfTrnsIds(paginatedTrnsIds).income !== 0"
@@ -252,7 +252,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
<div
v-for="(groupTrnsIds, date) in groupedTrns"
:key="date"
- class="bg-item-9 overflow-hidden rounded-lg"
+ class="overflow-hidden rounded-lg bg-item-9"
>
<div
:class="{ 'border-item-5': isShowGroupSum && groupTrnsIds.length > 1 }"
@@ -311,7 +311,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
class="flex-center pt-1"
>
<div
- class="flex-center bg-item-5 text-2 hocus:bg-item-6 rounded-full px-5 py-2 text-sm"
+ class="flex-center rounded-full bg-item-5 px-5 py-2 text-sm text-2 hocus:bg-item-6"
@click="pageNumber = ++pageNumber"
>
{{ t("trns.more") }} {{ paginatedTrnsIds.length }} /
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index 0ef74899..a68d0465 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -49,7 +49,7 @@ const classes = computed(() => cn(
'ml-[48px] group-last/item:hidden': lineWidth === 4,
'group-last:hidden': lineWidth !== 3 && lineWidth !== 4,
}"
- class="bg-item-5 mx-2 h-px"
+ class="mx-2 h-px bg-item-5"
/>
</div>
</template>
diff --git a/app/components/ui/Header.vue b/app/components/ui/Header.vue
index ef96a5af..3dfd454e 100644
--- a/app/components/ui/Header.vue
+++ b/app/components/ui/Header.vue
@@ -1,5 +1,5 @@
<template>
- <div class="border-item-3 mb-2 flex min-h-12 max-w-7xl items-center border-b px-2 py-1 sm:min-h-14 lg:px-4 2xl:px-8">
+ <div class="mb-2 flex min-h-12 max-w-7xl items-center border-b border-item-3 px-2 sm:min-h-14 lg:px-4 2xl:px-8">
<div class="flex grow items-center gap-2">
<slot />
diff --git a/app/components/ui/Item2.vue b/app/components/ui/Item2.vue
index d8f9bf03..1c48e756 100644
--- a/app/components/ui/Item2.vue
+++ b/app/components/ui/Item2.vue
@@ -1,6 +1,4 @@
<script setup lang="ts">
-import { getStyles } from '~/components/ui/getStyles'
-
const emit = defineEmits<{
click: [e: Event]
}>()
@@ -11,7 +9,7 @@ const emit = defineEmits<{
insideClasses="w-full !min-h-[44px] bg-item-4 px-2 @xl/page:px-4 block @xl/page:flex @xl/page:flex-wrap gap-0 gap-x-2"
@click="(e: Event) => emit('click', e)"
>
- <div class="text-2 text-sm">
+ <div class="text-sm text-2">
<slot name="label" />
</div>
diff --git a/app/components/ui/Page.vue b/app/components/ui/Page.vue
index 4738b63a..0abd868e 100644
--- a/app/components/ui/Page.vue
+++ b/app/components/ui/Page.vue
@@ -2,8 +2,8 @@
<div
class="
@container/page
- bg-foreground-1 sm:border-item-5 relative
- rounded-xl sm:border sm:p-2 md:p-3 lg:p-4
+ relative rounded-xl bg-foreground-1
+ sm:border sm:border-item-5 sm:p-2 md:p-3 lg:p-4
"
style="padding-bottom: calc(50px + env(safe-area-inset-bottom))"
>
diff --git a/app/components/ui/Tabs1.global.vue b/app/components/ui/Tabs1.global.vue
index 579f4dcc..4ac942a8 100644
--- a/app/components/ui/Tabs1.global.vue
+++ b/app/components/ui/Tabs1.global.vue
@@ -1,5 +1,5 @@
<template>
- <div class="bg-item-4 flex grow items-center overflow-hidden overflow-x-auto rounded-md">
+ <div class="flex grow items-center overflow-hidden overflow-x-auto rounded-md bg-item-9">
<slot />
</div>
</template>
diff --git a/app/components/ui/Title3.vue b/app/components/ui/Title3.vue
index e72c8c7e..7eee4825 100644
--- a/app/components/ui/Title3.vue
+++ b/app/components/ui/Title3.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-tertiary text-3 text-base font-semibold leading-none"
+ class="font-tertiary text-base font-semibold leading-none text-3"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index 5aa31501..7ceb280a 100644
--- a/app/components/wallets/Item.vue
+++ b/app/components/wallets/Item.vue
@@ -80,7 +80,7 @@ if (!props.isSort) {
<!-- Main -->
<template v-if="!props.alt">
<div class="grid grow gap-1">
- <div class="text-3 text-sm leading-none">
+ <div class="text-sm leading-none text-3">
{{ wallet.name }}
</div>
<div
@@ -145,14 +145,14 @@ if (!props.isSort) {
/>
</div>
- <div class="text-3 whitespace-nowrap text-sm leading-none">
+ <div class="whitespace-nowrap text-sm leading-none text-3">
{{ wallet.name }}
</div>
</div>
<div
v-if="isSort"
- class="sortHandle flex-center group-hocus:bg-item-5 absolute right-0 h-full rounded-md px-3"
+ class="sortHandle flex-center absolute right-0 h-full rounded-md px-3 group-hocus:bg-item-5"
>
<Icon name="lucide:grip-vertical" size="20" />
</div>
diff --git a/app/components/wallets/page/List.vue b/app/components/wallets/page/List.vue
index 77e7ec00..bc76cdf0 100644
--- a/app/components/wallets/page/List.vue
+++ b/app/components/wallets/page/List.vue
@@ -333,7 +333,7 @@ const counts = computed(() => ({
v-else
class="max-w-4xl grow px-2 lg:px-4 2xl:px-8"
>
- <div class="@xl/page:grid-cols-2 @xl/page:gap-12 grid max-w-3xl">
+ <div class="@xl/page:grid-cols-2 @xl/page:gap-12 grid">
<div class="@xl/page:order-1 @xl/page:gap-4 @xl/page:pt-1 @md/page:pb-2 grid content-start pb-1">
<div
v-if="walletsStore.currenciesUsed.length > 1"
@@ -438,7 +438,7 @@ const counts = computed(() => ({
</div>
<div>
- <div class="mb-2 flex items-center gap-2">
+ <div class="mb-2 flex items-center gap-2 md:pt-2">
<UiTabs2>
<UiTabsItem4
:isActive="groupedBy === 'list'"
@@ -544,7 +544,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<template v-if="groupedOptions.currencies === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -586,7 +586,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
@@ -634,7 +634,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<template v-if="groupedOptions.type === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -685,7 +685,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 4874181b..94dc8ba7 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -39,7 +39,7 @@ function onGenerateDemoData() {
<UiHeaderTitle>{{ t('settings.title') }}</UiHeaderTitle>
</UiHeader>
- <div class="pageWrapper bg-foreground-1 rounded-xl pt-4">
+ <div class="pageWrapper rounded-xl bg-foreground-1 pt-4">
<div>
<!-- Locale -->
<div class="pb-12">
@@ -82,7 +82,7 @@ function onGenerateDemoData() {
</UiTitle3>
<div
v-if="userStore.user"
- class="text-item-2 pb-4"
+ class="pb-4 text-item-2"
>
{{ userStore.user?.email }}
</div>
@@ -102,7 +102,7 @@ function onGenerateDemoData() {
<UiTitle3 class="pb-2">
{{ t('settings.caution') }}
</UiTitle3>
- <div class="text-item-2 pb-4 text-xs leading-none">
+ <div class="pb-4 text-xs leading-none text-item-2">
{{ t('alerts.willDeleteEverything') }}
</div>
@@ -138,7 +138,7 @@ function onGenerateDemoData() {
<!-- About -->
<div class="pb-12">
{{ t('app.about') }}
- <div class="text-item-2 pt-4 text-xs">
+ <div class="pt-4 text-xs text-item-2">
{{ t('app.version') }} {{ version }}
</div>
</div>