Skip to content

Open source personal finance application

refactor: improve styling consistency and class structure across components

Ilya Komichev036b7ea7624c
diff --git a/app/assets/css/theme.css b/app/assets/css/theme.css
index 8d37f3c2..e5ad1003 100644
--- a/app/assets/css/theme.css
+++ b/app/assets/css/theme.css
@@ -136,9 +136,9 @@ html.pink {
/* --foreground-1: 23 23 23; */
--foreground-2: 24 24 24;
- --c-blue-1: #FF69B4;
+ --c-blue-1: #ff69b4;
--accent-1: 219 39 119;
- --accent-2: #FF1493;
+ --accent-2: #ff1493;
/* --item-hover: #2a161e; */
/* --c-item-4: #29161d; */
diff --git a/app/components/bottomSheet/BottomSheetClose.vue b/app/components/bottomSheet/BottomSheetClose.vue
index 69dc15d2..6bae618c 100644
--- a/app/components/bottomSheet/BottomSheetClose.vue
+++ b/app/components/bottomSheet/BottomSheetClose.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="bg-item-4 hover:bg-item-hover absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full transition ease-in-out"
+ class="absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full bg-item-4 transition ease-in-out hover:bg-item-hover"
@click="(e: Event) => emit('onClick', e)"
>
<Icon
diff --git a/app/components/bottomSheet/BottomSheetHandler.vue b/app/components/bottomSheet/BottomSheetHandler.vue
index e96997da..e87fd573 100644
--- a/app/components/bottomSheet/BottomSheetHandler.vue
+++ b/app/components/bottomSheet/BottomSheetHandler.vue
@@ -1,9 +1,9 @@
<template>
<div
class="
- handler flex-center after:bg-item-11 hover:bg-item-hover absolute left-0 top-0
- z-30 h-[16px] w-full
- transition after:block after:h-[4px] after:w-[32px] after:rounded after:content-['']
+ handler flex-center absolute left-0 top-0 z-30 h-[16px]
+ w-full transition after:block
+ after:h-[4px] after:w-[32px] after:rounded after:bg-item-11 after:content-[''] hover:bg-item-hover
"
/>
</template>
diff --git a/app/components/categories/Header.vue b/app/components/categories/Header.vue
index 2dadcf4a..469742d1 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-hover 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-hover"
@click="onParentClick"
>
{{ props.parentCategory.name }}
diff --git a/app/components/color/Palette.vue b/app/components/color/Palette.vue
index a5cbc7a1..b2b68fe4 100644
--- a/app/components/color/Palette.vue
+++ b/app/components/color/Palette.vue
@@ -53,7 +53,7 @@ function findWalletWithColor(color: string) {
<div
v-if="props.isWallet && findWalletWithColor(color)"
- class="bg-item-3 size-3 rounded-full"
+ class="size-3 rounded-full bg-item-3"
/>
</div>
</div>
@@ -67,7 +67,7 @@ function findWalletWithColor(color: string) {
</template>
<input
:value="activeColor"
- class="border-item-3 focus:border-accent-2 focus:bg-item-hover focus:text-1 h-12 w-full rounded-lg border border-solid p-0 transition ease-in-out focus:outline-none"
+ class="h-12 w-full rounded-lg border border-solid border-item-3 p-0 transition ease-in-out focus:border-accent-2 focus:bg-item-hover 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 7888707a..7d47233e 100644
--- a/app/components/date/LinkItem.vue
+++ b/app/components/date/LinkItem.vue
@@ -17,7 +17,7 @@ const emit = defineEmits<{
'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/date/LinkItemNoBg.vue b/app/components/date/LinkItemNoBg.vue
index e13eca5c..0c3c6aa1 100644
--- a/app/components/date/LinkItemNoBg.vue
+++ b/app/components/date/LinkItemNoBg.vue
@@ -16,7 +16,7 @@ const emit = defineEmits<{
'bg-item-hover text-accent-1': props.isActive,
},
]"
- class="font-primary text-2xs text-2 text-nowrap rounded-full leading-none"
+ class="text-nowrap rounded-full font-primary text-2xs leading-none text-2"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vue
index fc8fdbd7..b622282f 100644
--- a/app/components/layout/MenuBottomModal.vue
+++ b/app/components/layout/MenuBottomModal.vue
@@ -21,7 +21,7 @@ const { isDemo } = useDemo()
<BottomSheetClose @onClick="close" />
</template>
- <div class="bg-foreground-1 grid gap-3 px-1 py-3">
+ <div class="grid gap-3 bg-foreground-1 px-1 py-3">
<!-- User -->
<div
v-if="userStore.user"
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index 10d2e6f8..6a0cd8df 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -63,7 +63,7 @@ const isShowLogoMenu = ref(false)
<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
@@ -88,7 +88,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>
@@ -125,7 +125,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/stat/Config.vue b/app/components/stat/Config.vue
index e15d0a61..5330950f 100644
--- a/app/components/stat/Config.vue
+++ b/app/components/stat/Config.vue
@@ -40,7 +40,7 @@ function updateWalletsLimit(value: number) {
<BottomSheetClose @click="close" />
<!-- Chart -->
- <div class="border-item-3 border-b pb-3">
+ <div class="border-b border-item-3 pb-3">
<UiTitleOption class="pb-2">
{{ t('stat.config.chartShow.title') }}
</UiTitleOption>
@@ -108,7 +108,7 @@ function updateWalletsLimit(value: number) {
<!-- Showed wallets -->
<div
v-if="props.isShowWallets"
- class="border-item-3 border-b pb-3"
+ class="border-b border-item-3 pb-3"
>
<UiTitleOption class="pb-2">
{{ t('stat.config.wallets.title') }}
diff --git a/app/components/stat/categories/Round.vue b/app/components/stat/categories/Round.vue
index 8c2a5c47..378bc6a1 100644
--- a/app/components/stat/categories/Round.vue
+++ b/app/components/stat/categories/Round.vue
@@ -65,7 +65,7 @@ onLongPress(
v-if="category"
ref="longPressRef"
:class="{ 'opacity-60': props.item.value === 0 }"
- class="bg-item-4 text-2 hover:bg-item-hover hocus:bg-item-hover relative flex items-center gap-2 overflow-hidden rounded-full p-1 pr-2"
+ class="relative flex items-center gap-2 overflow-hidden rounded-full bg-item-4 p-1 pr-2 text-2 hover:bg-item-hover hocus:bg-item-hover"
>
<div
:style="{ backgroundColor: category?.color }"
diff --git a/app/components/stat/categories/Vertical.vue b/app/components/stat/categories/Vertical.vue
index 19aa99e1..2c332ca1 100644
--- a/app/components/stat/categories/Vertical.vue
+++ b/app/components/stat/categories/Vertical.vue
@@ -93,9 +93,9 @@ onLongPress(
<div
v-if="category"
ref="longPressRef"
- class="hocus:bg-item-hover rounded p-1"
+ class="rounded p-1 hocus:bg-item-hover"
>
- <div class="bg-item-4 flex h-28 items-end rounded">
+ <div class="flex h-28 items-end rounded bg-item-4">
<div
class="relative w-7 rounded-t"
:style="getBarStyle()"
@@ -104,7 +104,7 @@ onLongPress(
:class="{
'text-income-1': props.item.value > 0,
}"
- class="font-secondary absolute top-[-14px] w-full text-center text-xs leading-none"
+ class="absolute top-[-14px] w-full text-center font-secondary text-xs leading-none"
>
{{ amount }}
</div>
diff --git a/app/components/trnForm/Date.vue b/app/components/trnForm/Date.vue
index 79928a61..d328b14d 100644
--- a/app/components/trnForm/Date.vue
+++ b/app/components/trnForm/Date.vue
@@ -33,7 +33,7 @@ function changeDate(way: 'prev' | 'next' | 'today') {
<div class="-ml-1 flex gap-1">
<UPopover class="grow">
<div
- class="text-3 hocus:bg-item-hover grid gap-1 rounded-md p-2 text-sm font-medium leading-none"
+ class="grid gap-1 rounded-md p-2 text-sm font-medium leading-none text-3 hocus:bg-item-hover"
v-html="formattedDate"
/>
diff --git a/app/components/trnForm/FloatOpener.vue b/app/components/trnForm/FloatOpener.vue
index c56d35ce..fcc0d67d 100644
--- a/app/components/trnForm/FloatOpener.vue
+++ b/app/components/trnForm/FloatOpener.vue
@@ -7,17 +7,17 @@ const { trnFormCreate } = useTrnsFormStore()
<template>
<div
class="
- hover:bg-item-hover group absolute bottom-0 right-0 z-20 hidden h-dvh items-end justify-center
- transition 2xl:flex
+ group absolute bottom-0 right-0 z-20 hidden h-dvh items-end justify-center transition
+ hover:bg-item-hover 2xl:flex
"
@click="trnFormCreate"
>
<div
class="
_group-hover:bg-accent-1
- text-icon-primary flex items-center
- justify-center rounded-full
- px-3 py-4 text-2xl
+ flex items-center justify-center
+ rounded-full px-3
+ py-4 text-2xl text-icon-primary
transition
group-hover:scale-125
"
diff --git a/app/components/trnForm/Main.vue b/app/components/trnForm/Main.vue
index 9af1c4d9..9ddb0c04 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/main/ActionSide.vue b/app/components/trnForm/main/ActionSide.vue
index df54fd03..2b1cd025 100644
--- a/app/components/trnForm/main/ActionSide.vue
+++ b/app/components/trnForm/main/ActionSide.vue
@@ -30,11 +30,11 @@ async function onClickSubmit() {
<template>
<div
:class="{
- '!bg-accent-1/50 hocus:!bg-accent-1/70 !border-transparent': !isMath && isSubmittable,
+ '!border-transparent !bg-accent-1/50 hocus:!bg-accent-1/70': !isMath && isSubmittable,
'!border-item-4 !text-2': !isSubmittable,
'!text-2': isMath,
}"
- class="border-item-3 text-1 hocus:scale-[1.02] hocus:bg-item-hover flex size-full items-center justify-center rounded-xl border p-1 py-4 text-center text-4xl transition"
+ class="flex size-full items-center justify-center rounded-xl border border-item-3 p-1 py-4 text-center text-4xl text-1 transition hocus:scale-[1.02] hocus:bg-item-hover"
@click="onClickSubmit"
>
<Icon v-if="!isMath && isSubmittable" name="mdi:check" />
diff --git a/app/components/trnForm/main/AmountTransfer.vue b/app/components/trnForm/main/AmountTransfer.vue
index 2d61ee7d..7995bf33 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-hover': 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 a87d38d6..071fbddc 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-hover
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-hover
"
tabindex="0"
@click="() => emit('click')"
diff --git a/app/components/trnForm/main/Input.vue b/app/components/trnForm/main/Input.vue
index 05570008..5e8e42de 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-2 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-2"
inputmode="tel"
@updateValue="(value: string) => emit('onChange', value || '')"
/>
diff --git a/app/components/trnForm/modal/Description.vue b/app/components/trnForm/modal/Description.vue
index 86528c83..7f13b59a 100644
--- a/app/components/trnForm/modal/Description.vue
+++ b/app/components/trnForm/modal/Description.vue
@@ -31,7 +31,7 @@ function onSave(close: () => void) {
<div class="px-2">
<textarea
v-model="desc"
- class="border-item-3 bg-item-4 placeholder:text-item-2 focus:border-accent-2 focus:bg-item-hover focus:text-item-1 m-0 h-28 w-full rounded-lg border border-solid px-4 py-3 text-base font-normal transition ease-in-out focus:outline-none"
+ class="m-0 h-28 w-full rounded-lg border border-solid border-item-3 bg-item-4 px-4 py-3 text-base font-normal transition ease-in-out placeholder:text-item-2 focus:border-accent-2 focus:bg-item-hover focus:text-item-1 focus:outline-none"
:placeholder="$t('trnForm.description.placeholder')"
/>
</div>
diff --git a/app/components/trns/List.vue b/app/components/trns/List.vue
index 6e028316..dec063a8 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-3 border-b pb-2 pr-3"
+ class="border-b border-item-3 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-3': isShowGroupSum && groupTrnsIds.length > 1 }"
@@ -311,7 +311,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
class="flex-center pt-1"
>
<div
- class="flex-center bg-item-hover text-2 hocus:bg-item-6 rounded-full px-5 py-2 text-sm"
+ class="flex-center rounded-full bg-item-hover 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/ButtonWithRight.vue b/app/components/ui/ButtonWithRight.vue
index 43567add..2cfcc3fe 100644
--- a/app/components/ui/ButtonWithRight.vue
+++ b/app/components/ui/ButtonWithRight.vue
@@ -6,6 +6,7 @@ const emit = defineEmits<{
<template>
<UiElement
+ class="@container/element"
insideClasses="max-w-lg w-full !min-h-[44px] bg-item-4 px-2 @xs/element:pl-4 @xs/element:pr-3 block @xs/element:flex @xs/element:flex-wrap gap-0 gap-x-2"
@click="(e: Event) => emit('click', e)"
>
diff --git a/app/components/ui/Checkbox.vue b/app/components/ui/Checkbox.vue
index 8d138595..268793e1 100644
--- a/app/components/ui/Checkbox.vue
+++ b/app/components/ui/Checkbox.vue
@@ -17,7 +17,7 @@ function handleClick() {
<template>
<div
- class="hocus:bg-item-hover flex grow items-center gap-3 rounded-lg p-2 text-sm"
+ class="flex grow items-center gap-3 rounded-lg p-2 text-sm hocus:bg-item-hover"
@click="handleClick"
>
<FormSwitch
@@ -25,7 +25,7 @@ function handleClick() {
:value="checkboxValue"
/>
- <div class="text-2 grow">
+ <div class="grow text-2">
{{ title }}
</div>
</div>
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index dfa8a6ea..beb3416f 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -24,10 +24,7 @@ const classes = computed(() => cn(
</script>
<template>
- <div
- class="@container/element"
- @click="(e: Event) => emit('click', e)"
- >
+ <div @click="(e: Event) => emit('click', e)">
<div :class="classes">
<div
v-if="slots.leftIcon"
diff --git a/app/components/ui/FormInput.vue b/app/components/ui/FormInput.vue
index 88405943..ee5071d5 100644
--- a/app/components/ui/FormInput.vue
+++ b/app/components/ui/FormInput.vue
@@ -18,7 +18,7 @@ const emit = defineEmits<{
:value="props.value"
:class="getStyles('item', ['link'])"
:type="props.type ?? 'text'"
- class="border-item-3 bg-item-4 placeholder:text-item-2 focus:border-accent-2 focus:bg-item-hover focus:text-item-1 m-0 w-full rounded-lg border border-solid px-4 py-2.5 text-base font-normal focus:outline-none"
+ class="m-0 w-full rounded-lg border border-solid border-item-3 bg-item-4 px-4 py-2.5 text-base font-normal placeholder:text-item-2 focus:border-accent-2 focus:bg-item-hover focus:text-item-1 focus:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
>
</template>
diff --git a/app/components/ui/TabsItem1.vue b/app/components/ui/TabsItem1.vue
index 0302027a..3d30e1ec 100644
--- a/app/components/ui/TabsItem1.vue
+++ b/app/components/ui/TabsItem1.vue
@@ -13,7 +13,7 @@ const emit = defineEmits(['click'])
:class="[getStyles('item', ['minh2']), {
'!bg-item-3': isActive,
}]"
- class="text-3 hocus:bg-item-hover flex flex-1 grow select-none items-center justify-center gap-1 rounded-lg px-2 text-sm"
+ class="flex flex-1 grow select-none items-center justify-center gap-1 rounded-lg px-2 text-sm text-3 hocus:bg-item-hover"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem3.vue b/app/components/ui/TabsItem3.vue
index 58e2987e..5f817784 100644
--- a/app/components/ui/TabsItem3.vue
+++ b/app/components/ui/TabsItem3.vue
@@ -13,7 +13,7 @@ const emit = defineEmits(['click'])
:class="[getStyles('item', ['minh2']), {
'!bg-item-3 !text-accent-1': isActive,
}]"
- class="text-3 hocus:bg-item-hover flex grow select-none items-center justify-center gap-1 px-2 text-sm"
+ class="flex grow select-none items-center justify-center gap-1 px-2 text-sm text-3 hocus:bg-item-hover"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/Toggle2.vue b/app/components/ui/Toggle2.vue
index 305b00c7..8b624c4e 100644
--- a/app/components/ui/Toggle2.vue
+++ b/app/components/ui/Toggle2.vue
@@ -41,7 +41,7 @@ const isShown = useStorage(`ui-toggle-${props.storageKey}`, props.initStatus)
<div
v-if="lineWidth && !isShown"
- class="bg-item-hover mx-2 h-px group-last:hidden"
+ class="mx-2 h-px bg-item-hover group-last:hidden"
:class="{ 'ml-12': lineWidth === 3, 'ml-11': lineWidth === 2 }"
/>
</div>
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index df25310c..89720233 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-hover 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-hover"
>
<Icon name="lucide:grip-vertical" size="20" />
</div>
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 707c7214..bceb9b51 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">
@@ -90,7 +90,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>
@@ -124,7 +124,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>