Skip to content

Open source personal finance application

chore(UI): update vars

Ilya Komichev811b40a635df
diff --git a/app/app.config.ts b/app/app.config.ts
index 0f383701..8f6549b4 100644
--- a/app/app.config.ts
+++ b/app/app.config.ts
@@ -18,7 +18,7 @@ export default defineAppConfig({
slots: {
group: 'p-0 py-1 first:pt-0',
item: 'p-0',
- label: 'z-10 sticky top-0 bg-[var(--ui-bg)]',
+ label: 'z-10 sticky top-0 bg-default',
viewport: 'scrollerBlock',
},
},
diff --git a/app/assets/css/main.css b/app/assets/css/main.css
index bec70076..521334bb 100644
--- a/app/assets/css/main.css
+++ b/app/assets/css/main.css
@@ -40,7 +40,7 @@
}
@utility bottomSheetDrugClassesCustom {
- @apply bg-[var(--ui-bg)] max-w-md rounded-xl;
+ @apply bg-default max-w-md rounded-xl;
}
@utility bottomSheetContent {
@@ -49,7 +49,7 @@
}
@utility bottomSheetContentInside {
- @apply grid h-full bg-[var(--ui-bg)] gap-1 overflow-hidden overflow-y-auto px-2 py-px;
+ @apply grid h-full bg-default gap-1 overflow-hidden overflow-y-auto px-2 py-px;
}
@utility bottomSheetContentBottom {
@@ -79,7 +79,7 @@
@layer base {
html,
body {
- @apply antialiased text-(--ui-text) bg-[var(--item-1)] select-none;
+ @apply antialiased text-default bg-[var(--item-1)] select-none;
overscroll-behavior-y: none;
}
}
diff --git a/app/assets/css/others.css b/app/assets/css/others.css
index 79647669..fb93727a 100644
--- a/app/assets/css/others.css
+++ b/app/assets/css/others.css
@@ -7,7 +7,7 @@
}
.Toastify__toast-body {
- @apply p-5 py-5 text-(--ui-text-muted);
+ @apply p-5 py-5 text-muted;
}
.Toastify__close-button {
diff --git a/app/components/app/Copyright.vue b/app/components/app/Copyright.vue
index c7798ae7..096a63a5 100644
--- a/app/components/app/Copyright.vue
+++ b/app/components/app/Copyright.vue
@@ -7,7 +7,7 @@ const { t } = useI18n()
<template>
<a
:class="[classes.item.rounded, classes.item.link, classes.item.center3]"
- class="px-5 py-2 text-sm text-(--ui-text-muted)"
+ class="px-5 py-2 text-sm text-muted"
href="https://ilko.me"
>
{{ t('madeBy.text') }}
diff --git a/app/components/bottomSheet/BottomSheetClose.vue b/app/components/bottomSheet/BottomSheetClose.vue
index 2c86ab2c..953de84c 100644
--- a/app/components/bottomSheet/BottomSheetClose.vue
+++ b/app/components/bottomSheet/BottomSheetClose.vue
@@ -11,7 +11,7 @@ const emit = defineEmits<{
>
<Icon
name="lucide:x"
- color="text-(--ui-text-muted)"
+ color="text-muted"
size="22"
/>
</div>
diff --git a/app/components/categories/Form.vue b/app/components/categories/Form.vue
index a470e267..b5e7dcaf 100644
--- a/app/components/categories/Form.vue
+++ b/app/components/categories/Form.vue
@@ -288,7 +288,7 @@ async function onSave() {
<a
href="https://icones.js.org/collection/mdi"
target="_blank"
- class="text-(--ui-primary) hover:underline"
+ class="text-primary hover:underline"
>Material Design Icons</a>
</template>
diff --git a/app/components/date/LinkItem.vue b/app/components/date/LinkItem.vue
index 0c449c24..f0446d7a 100644
--- a/app/components/date/LinkItem.vue
+++ b/app/components/date/LinkItem.vue
@@ -17,10 +17,10 @@ const emit = defineEmits<{
<template>
<div
:class="cn(
- 'flex items-center text-nowrap rounded-(--ui-radius) text-xs leading-none px-3',
+ 'flex items-center text-nowrap rounded-sm text-xs leading-none px-3',
[classes.item.link, classes.item.minh3, classes.item.center2],
- props.variant === 'small' ? 'px-2 text-2xs text-(--ui-text-muted)' : 'bg-[var(--item-4)]',
- props.isActive ? 'text-(--ui-primary)' : '',
+ props.variant === 'small' ? 'px-2 text-2xs text-muted' : 'bg-[var(--item-4)]',
+ props.isActive ? 'text-primary' : '',
)"
@click="(e: Event) => emit('click', e)"
>
diff --git a/app/components/date/LinkItemNoBg.vue b/app/components/date/LinkItemNoBg.vue
index 6161b235..07186044 100644
--- a/app/components/date/LinkItemNoBg.vue
+++ b/app/components/date/LinkItemNoBg.vue
@@ -13,7 +13,7 @@ const emit = defineEmits<{
<div
:class="[
getStyles('item', ['center2', 'padding4', 'minh3']), {
- 'bg-[var(--item-5)] text-(--ui-primary)': props.isActive,
+ 'bg-[var(--item-5)] text-primary': props.isActive,
},
]"
class="text-nowrap rounded-full text-xs leading-none text-(--ui-text)"
diff --git a/app/components/date/Picker.vue b/app/components/date/Picker.vue
index f89e3a22..8631f75e 100644
--- a/app/components/date/Picker.vue
+++ b/app/components/date/Picker.vue
@@ -94,9 +94,9 @@ html .vc-light {
--vc-nav-hover-bg: var(--item-5);
--vc-color: var(--text-1);
--vc-day-content-disabled-color: var(--text-1/.40);
- --vc-weekday-color: var(--text-(--ui-text-muted));
+ --vc-weekday-color: var(--text-muted);
--vc-header-title-color: var(--text-3);
- --vc-popover-content-color: var(--text-(--ui-text-muted));
+ --vc-popover-content-color: var(--text-muted);
--vc-nav-title-color: var(--text-3);
--vc-nav-item-current-color: var(--ui-primary);
--vc-highlight-solid-bg: var(--ui-primary);
diff --git a/app/components/date/Ranges.vue b/app/components/date/Ranges.vue
index 35569545..e435dd97 100644
--- a/app/components/date/Ranges.vue
+++ b/app/components/date/Ranges.vue
@@ -124,7 +124,7 @@ function selectMaxRange(isSkipEmpty = false) {
</template>
<template v-if="props.isShowRangeAdjust">
- <div class="flex border border-(--ui-border) rounded-(--ui-radius) bg-(--ui-bg) p-px gap-1">
+ <div class="flex border border-default rounded-sm bg-default p-px gap-1">
<DateLinkItem
v-bind="props.itemProps"
@click="props.statDate.minusRange"
diff --git a/app/components/form/Input.vue b/app/components/form/Input.vue
index 1000dfa5..b78b4352 100644
--- a/app/components/form/Input.vue
+++ b/app/components/form/Input.vue
@@ -18,7 +18,7 @@ const emit = defineEmits<{
:value="props.value"
:class="getStyles('item', ['link', 'rounded'])"
:type="props.type ?? 'text'"
- class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-(--ui-text-muted) hover:border-(--ui-primary) hover:bg-[var(--item-5)] hover:text-1 hover:outline-none"
+ class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-muted hover:border-(--ui-primary) hover:bg-[var(--item-5)] hover:text-1 hover:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
>
</template>
diff --git a/app/components/form/Switch.vue b/app/components/form/Switch.vue
index 6e6c3db6..f112fa58 100644
--- a/app/components/form/Switch.vue
+++ b/app/components/form/Switch.vue
@@ -21,7 +21,7 @@ const emit = defineEmits<{
>
<div
:class="{ 'translate-x-4.5': value }"
- class="size-4.5 rounded-xl bg-(--ui-bg) shadow-md transition-transform ease-in-out"
+ class="size-4.5 rounded-xl bg-default shadow-md transition-transform ease-in-out"
/>
</div>
</div>
diff --git a/app/components/form/Textarea.vue b/app/components/form/Textarea.vue
index 268e51c5..73b34798 100644
--- a/app/components/form/Textarea.vue
+++ b/app/components/form/Textarea.vue
@@ -17,7 +17,7 @@ const emit = defineEmits<{
:placeholder="props.placeholder"
:value="props.value"
:class="getStyles('item', ['link', 'rounded'])"
- class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-(--ui-text-muted) hover:border-(--ui-primary) hover:bg-[var(--item-5)] hover:text-1 hover:outline-none"
+ class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-muted hover:border-(--ui-primary) hover:bg-[var(--item-5)] hover:text-1 hover:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
/>
</template>
diff --git a/app/components/layout/MenuBottom.vue b/app/components/layout/MenuBottom.vue
index 70dc880c..b021130e 100644
--- a/app/components/layout/MenuBottom.vue
+++ b/app/components/layout/MenuBottom.vue
@@ -6,7 +6,7 @@ const { itemsBottom } = useMenuData()
<template>
<div
- class="sm:bottom-inherit sticky bottom-0 left-0 z-20 mx-auto flex w-full items-stretch bg-(--ui-bg)/90 backdrop-blur sm:hidden lg:hidden"
+ class="sm:bottom-inherit sticky bottom-0 left-0 z-20 mx-auto flex w-full items-stretch bg-default/90 backdrop-blur sm:hidden lg:hidden"
style="padding-bottom: calc(env(safe-area-inset-bottom) - 16px)"
>
<LayoutSidebarMenuItem
diff --git a/app/components/layout/SidebarMenuItem.vue b/app/components/layout/SidebarMenuItem.vue
index 4d0ccc9a..4ccf6857 100644
--- a/app/components/layout/SidebarMenuItem.vue
+++ b/app/components/layout/SidebarMenuItem.vue
@@ -21,11 +21,11 @@ const { checkIsActive, onClick } = useMenuData()
:class="[
getStyles('item', ['center', 'link', 'minh2', 'rounded', 'padding1']),
{
- '!text-(--ui-primary)': checkIsActive(props.menuId),
+ '!text-primary': checkIsActive(props.menuId),
'gap-3': props.isShowText,
},
]"
- class="group min-h-[44px] text-(--ui-text-muted) md:min-h-[38px]"
+ class="group min-h-[44px] text-muted md:min-h-[38px]"
@click="onClick(props.menuId)"
>
<div class="flex min-w-8 items-center justify-center">
diff --git a/app/components/stat/ConfigModal.vue b/app/components/stat/ConfigModal.vue
index 6c2fdcb5..ecb6bc1d 100644
--- a/app/components/stat/ConfigModal.vue
+++ b/app/components/stat/ConfigModal.vue
@@ -141,7 +141,7 @@ function updateStatAverage(value: number) {
class="flex gap-4 pt-2"
>
<div class="flex gap-1">
- <div class="flex border border-(--ui-border) rounded-(--ui-radius) bg-(--ui-bg) p-px gap-1">
+ <div class="flex border border-default rounded-sm bg-default p-px gap-1">
<DateLinkItem
:class="[{
'!hover:transparent opacity-30': statConfig.config.value.wallets.count === 1,
diff --git a/app/components/stat/Menu.vue b/app/components/stat/Menu.vue
index 123d42b9..f3befaeb 100644
--- a/app/components/stat/Menu.vue
+++ b/app/components/stat/Menu.vue
@@ -57,7 +57,7 @@ watch(() => props.active, () => {
:key="item.id"
:class="[{
'!border-(--ui-primary) rounded-none border-b border-b-1': item.id === props.active,
- 'text-(--ui-text-muted) hover:pb-1 hover:mb-1 hover:bg-[var(--item-5)]': item.id !== props.active,
+ 'text-muted hover:pb-1 hover:mb-1 hover:bg-[var(--item-5)]': item.id !== props.active,
}]"
class="text-nowrap rounded-lg px-3 py-1.5 pb-2 text-xs lg:text-sm tracking-wide"
@click="onClickStatMenu(item.id)"
diff --git a/app/components/stat/chart/Intervals.vue b/app/components/stat/chart/Intervals.vue
index 1894a308..f28300b3 100644
--- a/app/components/stat/chart/Intervals.vue
+++ b/app/components/stat/chart/Intervals.vue
@@ -47,7 +47,7 @@ const value = ref(props.period)
v-model="value"
:items="items"
:ui="{
- base: 'ring-0 text-(--ui-text-muted) text-2xs hover:bg-[var(--item-5)]',
+ base: 'ring-0 text-muted text-2xs hover:bg-[var(--item-5)]',
trailingIcon: 'size-4',
content: 'w-24',
}"
diff --git a/app/components/stat/chart/View.vue b/app/components/stat/chart/View.vue
index 2afa3b98..2c93e71e 100644
--- a/app/components/stat/chart/View.vue
+++ b/app/components/stat/chart/View.vue
@@ -85,7 +85,7 @@ const option = computed(() => {
formatter(params: ChartParams[]) {
let content = '<div class="px-1">'
content = `${content}
- <div class="text-md pb-2 text-(--ui-text-muted) text-right">${formatByLocale(new Date(+params[0].name), getFormatForChart(props.period), locale.value)}</div>
+ <div class="text-md pb-2 text-muted text-right">${formatByLocale(new Date(+params[0].name), getFormatForChart(props.period), locale.value)}</div>
<div class="grid gap-1">
`
diff --git a/app/components/stat/date/Navigation.vue b/app/components/stat/date/Navigation.vue
index fd36c81b..561816b0 100644
--- a/app/components/stat/date/Navigation.vue
+++ b/app/components/stat/date/Navigation.vue
@@ -59,7 +59,7 @@ function changeDate(way: 'next' | 'prev' | 'today') {
</script>
<template>
- <div class="items-top flex items-center grow gap-2 sticky top-[77px] lg:top-[89px] py-2 -my-2 sticky z-20 bg-(--ui-bg)/90 backdrop-blur overflow-x-auto">
+ <div class="items-top flex items-center grow gap-2 sticky top-[77px] lg:top-[89px] py-2 -my-2 sticky z-20 bg-default/90 backdrop-blur overflow-x-auto">
<div
v-if="!statDate.params.value.customDate"
class="flex gap-1"
diff --git a/app/components/stat/date/Selector.vue b/app/components/stat/date/Selector.vue
index 8f99f4e6..19a81f86 100644
--- a/app/components/stat/date/Selector.vue
+++ b/app/components/stat/date/Selector.vue
@@ -97,7 +97,7 @@ function selectInterval(grouped: Grouped) {
{{ t(`dates.${item.intervalsBy}.simple`) }}
</DateLinkItem>
- <div class="flex border border-(--ui-border) rounded-(--ui-radius) bg-(--ui-bg) p-px gap-1">
+ <div class="flex border border-default rounded-sm bg-default p-px gap-1">
<DateLinkItem @click="statDate.delInterval">
-
</DateLinkItem>
diff --git a/app/components/stat/sum/Item.vue b/app/components/stat/sum/Item.vue
index 05b796cf..dca31942 100644
--- a/app/components/stat/sum/Item.vue
+++ b/app/components/stat/sum/Item.vue
@@ -25,7 +25,7 @@ const currenciesStore = useCurrenciesStore()
<template>
<div
- class="@2xl/page:px-4 @2xl/page:py-2 rounded-(--ui-radius) border border-transparent bg-[var(--item-3)] px-2 py-2 grow flex-1 flex-wrap @2xl/page:max-w-max"
+ class="@2xl/page:px-4 @2xl/page:py-2 rounded-sm border border-transparent bg-[var(--item-3)] px-2 py-2 grow flex-1 flex-wrap @2xl/page:max-w-max"
:class="{
'!border-(--ui-primary)/40 !bg-item-2': props.isActive,
}"
diff --git a/app/components/theme/PickerButton.vue b/app/components/theme/PickerButton.vue
index 984f0200..28fc5ccc 100644
--- a/app/components/theme/PickerButton.vue
+++ b/app/components/theme/PickerButton.vue
@@ -15,7 +15,7 @@ defineProps<{
:icon="icon"
:label="label"
class="capitalize ring-(--ui-border) rounded-[calc(var(--ui-radius))] text-[11px]"
- :class="[selected ? 'bg-(--ui-bg-elevated)' : 'hover:bg-(--ui-bg-elevated)/50']"
+ :class="[selected ? 'bg-elevated' : 'hover:bg-elevated/50']"
>
<template v-if="chip" #leading>
<slot name="leading">
diff --git a/app/components/trnForm/Bottom.vue b/app/components/trnForm/Bottom.vue
index 863645cb..3f74105b 100644
--- a/app/components/trnForm/Bottom.vue
+++ b/app/components/trnForm/Bottom.vue
@@ -78,12 +78,12 @@ onMounted(init)
<BottomSheetClose @onClick="close" />
</template>
- <div class="trnForm @container/trnForm bg-[var(--ui-bg)]">
+ <div class="trnForm @container/trnForm bg-default">
<div ref="sliderRef" class="swiper-container">
<div class="swiper-wrapper">
<!-- History -->
<div
- class="swiper-slide h-full overflow-y-auto bg-[var(--ui-bg)]"
+ class="swiper-slide h-full overflow-y-auto bg-default"
:style="{ height: maxHeight }"
>
<TrnFormTrnsSlide
@@ -94,7 +94,7 @@ onMounted(init)
</div>
<!-- Main -->
- <div class="swiper-slide getHeight bg-[var(--ui-bg)]">
+ <div class="swiper-slide getHeight bg-default">
<div class="scrollerBlock h-full overflow-y-auto">
<div class="max-h-[98dvh]">
<TrnFormMain
@@ -106,7 +106,7 @@ onMounted(init)
<!-- Quick selector -->
<div
- class="swiper-slide bg-[var(--ui-bg)]"
+ class="swiper-slide bg-default"
:style="{ height: maxHeight }"
>
<div class="scrollerBlock h-full overflow-y-auto">
diff --git a/app/components/trnForm/Main.vue b/app/components/trnForm/Main.vue
index 69089ae7..b92b1edd 100644
--- a/app/components/trnForm/Main.vue
+++ b/app/components/trnForm/Main.vue
@@ -131,7 +131,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="leading-none text-(--ui-text-muted)">
+ <div class="leading-none text-muted">
{{ item.label }}
</div>
</UiElement>
@@ -154,7 +154,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="leading-none text-(--ui-text-muted)">
+ <div class="leading-none text-muted">
{{ t(item.label) }}
</div>
</UiItem1>
diff --git a/app/components/trnForm/Sidebar.vue b/app/components/trnForm/Sidebar.vue
index 7614207f..0ede812c 100644
--- a/app/components/trnForm/Sidebar.vue
+++ b/app/components/trnForm/Sidebar.vue
@@ -59,7 +59,7 @@ watch(isShow, (v) => {
<div ref="sliderRef2" class="swiper-container h-full">
<div class="swiper-wrapper">
<!-- Main -->
- <div class="swiper-slide h-full bg-[var(--ui-bg)]">
+ <div class="swiper-slide h-full bg-default">
<div class="scrollerBlock grid h-full grid-rows-[auto_1fr] gap-4 overflow-y-auto items-start">
<TrnFormMain
maxHeight="100vh"
@@ -80,7 +80,7 @@ watch(isShow, (v) => {
:style="{ height: '100%' }"
>
<div class="scrollerBlock h-full overflow-y-auto">
- <UiTitle3 class="sticky top-0 z-10 bg-[var(--ui-bg)] px-4 pb-3 pt-5 md:text-xl">
+ <UiTitle3 class="sticky top-0 z-10 bg-default px-4 pb-3 pt-5 md:text-xl">
{{ t('trns.history') }}
</UiTitle3>
diff --git a/app/components/trnForm/main/ActionSide.vue b/app/components/trnForm/main/ActionSide.vue
index ff829ebf..126cf3dc 100644
--- a/app/components/trnForm/main/ActionSide.vue
+++ b/app/components/trnForm/main/ActionSide.vue
@@ -31,7 +31,7 @@ async function onClickSubmit() {
<div
:class="{
'!hover:bg-(--ui-primary) !bg-(--ui-primary)/60 text-icon-primary': !isMath && isSubmittable,
- 'text-(--ui-text-muted)': !isSubmittable || isMath,
+ 'text-muted': !isSubmittable || isMath,
}"
class="flex size-full items-center justify-center rounded-[var(--ui-radius)] bg-item-4 p-1 py-4 text-center text-4xl text-1 transition hover:scale-[1.02] hover:bg-[var(--item-5)]"
@click="onClickSubmit"
diff --git a/app/components/trnForm/useTrnsFormStore.ts b/app/components/trnForm/useTrnsFormStore.ts
index 46c0968a..824f58ac 100644
--- a/app/components/trnForm/useTrnsFormStore.ts
+++ b/app/components/trnForm/useTrnsFormStore.ts
@@ -165,10 +165,10 @@ export const useTrnsFormStore = defineStore('trnForm', () => {
try {
const validateStatus = validate(data)
- if (validateStatus.error) {
+ if (validateStatus.error || !data) {
$toast(UiToastContent, {
data: {
- description: validateStatus.error,
+ description: validateStatus.error ?? 'No data',
title: random(errorEmo),
},
toastId: 'trn-form-error',
@@ -236,7 +236,7 @@ export const useTrnsFormStore = defineStore('trnForm', () => {
}
function trnFormDuplicate(trnId: TrnId) {
- const trn = trnsStore.items?.[trnId]
+ const trn = trnsStore.items?.[trnId] as TrnItem
if (!trn)
return
diff --git a/app/components/trns/List.vue b/app/components/trns/List.vue
index 7d387347..7f7e7807 100644
--- a/app/components/trns/List.vue
+++ b/app/components/trns/List.vue
@@ -323,7 +323,7 @@ function onOpenTrnForm(date: number) {
class="pt-1 px-2"
>
<div
- class="flex-center rounded-[var(--ui-radius)] bg-[var(--item-5)] px-5 py-2 text-sm text-(--ui-text-muted) hover:bg-item-6"
+ class="flex-center rounded-[var(--ui-radius)] bg-[var(--item-5)] px-5 py-2 text-sm text-muted hover:bg-item-6"
@click="pageNumber = ++pageNumber"
>
{{ t("trns.more") }} {{ paginatedTrnsIds.length }} /
diff --git a/app/components/trns/NoTrns.vue b/app/components/trns/NoTrns.vue
index bc74b7e4..e0238bb8 100644
--- a/app/components/trns/NoTrns.vue
+++ b/app/components/trns/NoTrns.vue
@@ -1,5 +1,5 @@
<template>
- <div class="flex-center flex gap-2 py-3 text-center text-(--ui-text-muted)">
+ <div class="flex-center flex gap-2 py-3 text-center text-muted">
<Icon name="lucide:tree-palm" size="22" />
<div class="text-base leading-none">
{{ $t("trns.noTrns") }}
diff --git a/app/components/trns/pages/History.vue b/app/components/trns/pages/History.vue
index 1b4bd155..a7cf9abc 100644
--- a/app/components/trns/pages/History.vue
+++ b/app/components/trns/pages/History.vue
@@ -65,7 +65,7 @@ watch([filter.categoriesIds, filter.walletsIds], () => {
</template>
</UiHeader>
- <div class="pageWrapper mb-4 rounded-xl bg-[var(--ui-bg)] pb-4 pt-3">
+ <div class="pageWrapper mb-4 rounded-xl bg-default pb-4 pt-3">
<div class="grid gap-3 @3xl/main:max-w-md">
<TrnsList
:trnsIds
diff --git a/app/components/ui/ButtonAccent.vue b/app/components/ui/ButtonAccent.vue
index fdbe156d..a150892e 100644
--- a/app/components/ui/ButtonAccent.vue
+++ b/app/components/ui/ButtonAccent.vue
@@ -11,7 +11,7 @@ const emit = defineEmits(['click'])
<template>
<UButton
- :class="{ 'rounded-full': props.rounded, 'rounded-(--ui-radius)': !props.rounded }"
+ :class="{ 'rounded-full': props.rounded, 'rounded-sm': !props.rounded }"
:loading="props.loading"
:size="props.size || 'lg'"
:variant="props.variant"
diff --git a/app/components/ui/ButtonWithRight.vue b/app/components/ui/ButtonWithRight.vue
index 11380f6f..57382a0d 100644
--- a/app/components/ui/ButtonWithRight.vue
+++ b/app/components/ui/ButtonWithRight.vue
@@ -24,7 +24,7 @@ const emit = defineEmits<{
>
<div
v-if="!props.isShowTitle"
- class="text-sm text-(--ui-text-muted)"
+ class="text-sm text-muted"
>
<slot name="label" />
</div>
diff --git a/app/components/ui/Checkbox.vue b/app/components/ui/Checkbox.vue
index b8c858c5..508d962b 100644
--- a/app/components/ui/Checkbox.vue
+++ b/app/components/ui/Checkbox.vue
@@ -25,7 +25,7 @@ function handleClick() {
:value="checkboxValue"
/>
- <div class="grow text-(--ui-text-muted)">
+ <div class="grow text-muted">
{{ title }}
</div>
</div>
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index 48209b17..b44d9239 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -17,7 +17,7 @@ const slots = useSlots()
const classes = computed(() => cn(
getStyles('item', ['padding1', 'minh1', 'link']),
- 'uiElement flex grow items-center gap-3 overflow-hidden -my-[1px] border border-transparent rounded-(--ui-radius)',
+ 'uiElement flex grow items-center gap-3 overflow-hidden -my-[1px] border border-transparent rounded-sm',
props.insideClasses,
{ 'relative border-(--ui-primary)/60 z-10': props.isActive },
))
diff --git a/app/components/ui/Header.vue b/app/components/ui/Header.vue
index 70bb3579..202b6dcc 100644
--- a/app/components/ui/Header.vue
+++ b/app/components/ui/Header.vue
@@ -1,5 +1,5 @@
<template>
- <div class="mb-2 top-0 sticky z-20 bg-(--ui-bg)/90 backdrop-blur">
+ <div class="mb-2 top-0 sticky z-20 bg-default/90 backdrop-blur">
<div class="py-2 grid max-w-7xl items-center border-b border-item-4 min-h-12 px-2 lg:px-4 2xl:px-8 lg:py-4">
<div class="flex grow items-center gap-2">
<slot />
diff --git a/app/components/ui/HeaderLink.vue b/app/components/ui/HeaderLink.vue
index 61d60a92..63a830f9 100644
--- a/app/components/ui/HeaderLink.vue
+++ b/app/components/ui/HeaderLink.vue
@@ -20,7 +20,7 @@ const emit = defineEmits<{
v-if="props.icon"
:name="props.icon"
size="20"
- class="text-(--ui-text-muted)"
+ class="text-muted"
/>
</template>
diff --git a/app/components/ui/Item1.vue b/app/components/ui/Item1.vue
index 0c2d8081..9a57db76 100644
--- a/app/components/ui/Item1.vue
+++ b/app/components/ui/Item1.vue
@@ -16,7 +16,7 @@ const emit = defineEmits<{
class="justify-center data-[state=open]:!bg-item-4" :class="[
getStyles('item', ['link', 'center', 'minh2', 'minw1', 'rounded']),
{
- 'text-xl text-(--ui-text-muted)': variant === 'icon',
+ 'text-xl text-muted': variant === 'icon',
},
{
'px-3 text-sm text-1': variant === 'text',
diff --git a/app/components/ui/Item4.vue b/app/components/ui/Item4.vue
index 1df7df12..7180de2d 100644
--- a/app/components/ui/Item4.vue
+++ b/app/components/ui/Item4.vue
@@ -21,7 +21,7 @@ const emit = defineEmits<{
classes.item.center,
classes.item.minw1,
classes.item.rounded,
- variant === 'icon' ? 'text-xl text-(--ui-text-muted)' : '',
+ variant === 'icon' ? 'text-xl text-muted' : '',
variant === 'text' ? 'px-3 text-sm text-1' : '',
isActive ? '!bg-item-3' : '',
)"
diff --git a/app/components/ui/Logo.vue b/app/components/ui/Logo.vue
index 913ae7dc..13de7786 100644
--- a/app/components/ui/Logo.vue
+++ b/app/components/ui/Logo.vue
@@ -1,5 +1,5 @@
<template>
- <div class="font-brand text-2xl font-bold first-letter:text-(--ui-primary)">
+ <div class="font-brand text-2xl font-bold first-letter:text-primary">
{{ $t('appName') }}
</div>
</template>
diff --git a/app/components/ui/TabsItem3.vue b/app/components/ui/TabsItem3.vue
index b5fc6912..c6ed3711 100644
--- a/app/components/ui/TabsItem3.vue
+++ b/app/components/ui/TabsItem3.vue
@@ -11,9 +11,9 @@ const emit = defineEmits(['click'])
<template>
<div
:class="[getStyles('item', ['minh2']), {
- '!bg-item-4 !text-(--ui-primary)': isActive,
+ '!bg-item-4 !text-primary': isActive,
}]"
- class="flex grow select-none items-center justify-center gap-1 px-2 text-sm leading-none text-(--ui-text-muted) hover:bg-[var(--item-5)]"
+ class="flex grow select-none items-center justify-center gap-1 px-2 text-sm leading-none text-muted hover:bg-[var(--item-5)]"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem4.vue b/app/components/ui/TabsItem4.vue
index c2f3ef5a..ee459260 100644
--- a/app/components/ui/TabsItem4.vue
+++ b/app/components/ui/TabsItem4.vue
@@ -13,7 +13,7 @@ const emit = defineEmits(['click'])
:class="[getStyles('item', ['link', 'rounded', 'minh3', 'minw2']), {
'!bg-item-4 !text-1': isActive,
}]"
- class="flex shrink-0 items-center justify-center gap-1 rounded-lg border-1 px-3 text-sm leading-none text-(--ui-text-muted)"
+ class="flex shrink-0 items-center justify-center gap-1 rounded-lg border-1 px-3 text-sm leading-none text-muted"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TextSm1.vue b/app/components/ui/TextSm1.vue
index 6cf9e886..14c3f2e1 100644
--- a/app/components/ui/TextSm1.vue
+++ b/app/components/ui/TextSm1.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-primary text-xs leading-none text-(--ui-text-muted)"
+ class="font-primary text-xs leading-none text-muted"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/TextSm2.vue b/app/components/ui/TextSm2.vue
index d41a6d4b..6ddd1a3a 100644
--- a/app/components/ui/TextSm2.vue
+++ b/app/components/ui/TextSm2.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-primary text-sm leading-none text-(--ui-text-muted)"
+ class="font-primary text-sm leading-none text-muted"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Title3.vue b/app/components/ui/Title3.vue
index 5fdb96d2..33dcc0c8 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-base font-semibold leading-none text-(--ui-text-muted)"
+ class="font-tertiary text-base font-semibold leading-none text-muted"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/TitleModal.vue b/app/components/ui/TitleModal.vue
index b2971c2c..b0e661ca 100644
--- a/app/components/ui/TitleModal.vue
+++ b/app/components/ui/TitleModal.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="sticky top-0 z-20 bg-[var(--ui-bg)] px-4 pb-4 pt-5 font-tertiary text-lg font-semibold leading-none"
+ class="sticky top-0 z-20 bg-default px-4 pb-4 pt-5 font-tertiary text-lg font-semibold leading-none"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/TitleOption.vue b/app/components/ui/TitleOption.vue
index 67ab8d0b..8901cf0d 100644
--- a/app/components/ui/TitleOption.vue
+++ b/app/components/ui/TitleOption.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-tertiary font-semibold leading-none text-(--ui-text-muted)"
+ class="font-tertiary font-semibold leading-none text-muted"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/getStyles.ts b/app/components/ui/getStyles.ts
index 33cd587a..34e966da 100644
--- a/app/components/ui/getStyles.ts
+++ b/app/components/ui/getStyles.ts
@@ -10,7 +10,7 @@ export const classes = {
gap1: 'gap-3',
link: `
select-none
- hover:bg-(--ui-bg-elevated)
+ hover:bg-elevated
`,
minh1: 'min-h-[42px]',
minh2: 'min-h-[38px]',
@@ -28,7 +28,7 @@ export const classes = {
padding3: 'px-3',
padding4: 'px-1',
- rounded: 'rounded-(--ui-radius)',
+ rounded: 'rounded-sm',
rounded2: 'rounded-lg',
rounded3: 'rounded-xl',
simple: '',
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index 2cdc1953..ce0605d7 100644
--- a/app/components/wallets/Item.vue
+++ b/app/components/wallets/Item.vue
@@ -84,7 +84,7 @@ if (!props.isSort) {
<!-- Main -->
<template v-if="!props.alt">
<div class="grid grow gap-1">
- <div class="text-sm leading-none text-(--ui-text-muted)">
+ <div class="text-sm leading-none text-muted">
{{ wallet.name }}
</div>
diff --git a/app/components/wallets/List.vue b/app/components/wallets/List.vue
index 3f26d78e..c55e0378 100644
--- a/app/components/wallets/List.vue
+++ b/app/components/wallets/List.vue
@@ -52,7 +52,7 @@ onMounted(() => stateLimit.value = props.limit)
>
<div
:class="getStyles('item', ['rounded', 'minh1', 'link', 'padding1', 'center3'])"
- class="-mt-px text-xs text-(--ui-text-muted)"
+ class="-mt-px text-xs text-muted"
@click="toggle"
>
<template v-if="stateLimit > 0">
diff --git a/app/components/wallets/Statistics.vue b/app/components/wallets/Statistics.vue
index c2381858..82d4149d 100644
--- a/app/components/wallets/Statistics.vue
+++ b/app/components/wallets/Statistics.vue
@@ -55,7 +55,7 @@ const itemsGrouped = computed(() => [
insideClasses="!min-h-[44px]"
@click="emit('click', item.id)"
>
- <div class="grow pl-1 text-sm leading-none text-(--ui-text-muted)">
+ <div class="grow pl-1 text-sm leading-none text-muted">
<div>
{{ $t(`money.types.${item.id}`) }}
</div>
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index 00a2f70f..282da7ed 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -89,7 +89,7 @@ usePageScroll()
'sm:pl-74 md:pl-74': isShowSidebar && width >= 767,
}"
>
- <div class="relative h-full overflow-hidden sm:rounded-2xl bg-[var(--ui-bg)] sm:border sm:border-item-4 max-w-5xl">
+ <div class="relative h-full overflow-hidden sm:rounded-2xl bg-default sm:border sm:border-item-4 max-w-5xl">
<main
id="pageScroll"
style="padding-bottom: calc(50px + env(safe-area-inset-bottom))"
diff --git a/app/pages/dev.vue b/app/pages/dev.vue
index a2da8def..c8c585bb 100644
--- a/app/pages/dev.vue
+++ b/app/pages/dev.vue
@@ -15,7 +15,7 @@
<div class="grid gap-4">
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Backgrounds
</div>
<div class="flex flex-wrap gap-0">
@@ -44,7 +44,7 @@
</div>
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Texts
</div>
<div class="flex flex-wrap gap-0">
@@ -65,7 +65,7 @@
<div class="flex flex-wrap gap-4">
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Accent
</div>
<div class="flex flex-wrap gap-0">
@@ -74,7 +74,7 @@
</div>
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Icon primary
</div>
<div class="flex flex-wrap gap-0">
@@ -85,7 +85,7 @@
</div>
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Alert
</div>
<div class="flex flex-wrap gap-0">
@@ -94,7 +94,7 @@
</div>
<div class="grid gap-2">
- <div class="text-sm text-(--ui-text-muted)">
+ <div class="text-sm text-muted">
Money
</div>
<div class="flex flex-wrap gap-0">
diff --git a/app/pages/login.vue b/app/pages/login.vue
index c2d49e5d..04140431 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -86,7 +86,7 @@ async function openDemo() {
>
<div class="flex flex-col items-center justify-center pb-10">
<UiLogo class="pb-0 !text-6xl !font-extrabold" />
- <div class="pt-1 text-sm text-(--ui-text-muted)">
+ <div class="pt-1 text-sm text-muted">
{{ t('description') }}
</div>
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 8dfc2b57..a3a627ce 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -105,7 +105,7 @@ function onGenerateDemoData() {
<!-- About -->
<div class="pb-12">
{{ t('app.about') }}
- <div class="pt-4 text-xs text-(--ui-text-muted)">
+ <div class="pt-4 text-xs text-muted">
{{ t('app.version') }} {{ version }}
<!-- <About /> -->
</div>