Open source personal finance application
refactor: update typography and styling across multiple components
Ilya Komicheved9c929cd5d6
diff --git a/app/components/stat/Menu.vue b/app/components/stat/Menu.vueindex 07a1bea0..1f3478cc 100644--- a/app/components/stat/Menu.vue+++ b/app/components/stat/Menu.vue@@ -56,7 +56,7 @@ function getClasses(id?: StatTabSlug) {return [{'!border-accent-1 text-1 rounded-none border-b-2': id === props.active,'text-2 hover:bg-item-5': id !== props.active,- }, 'text-nowrap rounded-lg px-3 py-1.5 text-sm font-medium']+ }, 'text-nowrap rounded-lg px-3 py-1.5 text-xs lg:text-sm tracking-wide']}</script>diff --git a/app/components/stat/categories/Section.vue b/app/components/stat/categories/Section.vueindex 8326c2e3..858fbb3a 100644--- a/app/components/stat/categories/Section.vue+++ b/app/components/stat/categories/Section.vue@@ -167,14 +167,14 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, par<template><divv-if="categoriesWithData.length > 0"- class="@3xl/page:gap-4 grid gap-4"+ class="@3xl/page:gap-4 grid gap-6"><!-- Vertical --><UiTogglev-if="statConfig.config.value.vertical.isShow":storageKey="`${storageKey}-${type}-vertical`":initStatus="true"- class="@3xl/page:p-3 rounded-xl border border-item-4 bg-item-2 p-2 md:max-w-lg"+ class="md:max-w-lg"><template #header="{ toggle, isShown }"><div class="flex items-center justify-between md:max-w-lg">@@ -207,41 +207,7 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, par/></UiItem1></UiTabs1>-- <!-- <UiTabs1>- <UiTabsItem4- :isActive="statConfig.config.value.vertical.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.vertical.isGrouped = true"- >- <Icon- name="lucide:network"- :size="16"- />- {{ t('stat.config.categories.grouping.grouped') }}- </UiTabsItem4>-- <UiTabsItem4- :isActive="!statConfig.config.value.vertical.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.vertical.isGrouped = false"- >- <Icon- name="lucide:folder-tree"- :size="16"- />- {{ t('stat.config.categories.grouping.ungrouped') }}- </UiTabsItem4>- </UiTabs1> --></div>-- <!-- <StatCategoriesButtons- v-if="isShown"- :catsLength="categoriesWithData.length"- :isShowGrouped="!props.isOneCategory"- :openedStatus- @toggleOpened="toggleOpened"- /> --></div><div@@ -266,7 +232,7 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, parv-if="statConfig.config.value.catsRound.isShow":storageKey="`${storageKey}-${type}-rounds`":initStatus="true"- class="@3xl/page:p-3 rounded-xl border border-item-4 bg-item-2 p-2 md:max-w-lg"+ class="md:max-w-lg"><template #header="{ toggle, isShown }"><div class="flex items-center justify-between md:max-w-lg">@@ -299,32 +265,6 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, par/></UiItem1></UiTabs1>-- <!-- <UiTabs1>- <UiTabsItem4- :isActive="statConfig.config.value.catsRound.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.catsRound.isGrouped = true"- >- <Icon- name="lucide:network"- :size="16"- />- {{ t('stat.config.categories.grouping.grouped') }}- </UiTabsItem4>-- <UiTabsItem4- :isActive="!statConfig.config.value.catsRound.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.catsRound.isGrouped = false"- >- <Icon- name="lucide:folder-tree"- :size="16"- />- {{ t('stat.config.categories.grouping.ungrouped') }}- </UiTabsItem4>- </UiTabs1> --></div></div>@@ -348,7 +288,7 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, parv-if="statConfig.config.value.catsList.isShow":storageKey="`${storageKey}-${type}-list`":initStatus="true"- class="@3xl/page:p-3 rounded-xl border border-item-4 bg-item-2 p-2 md:max-w-lg"+ class="md:max-w-lg"><template #header="{ toggle, isShown }"><div class="flex items-center justify-between md:max-w-lg">@@ -399,32 +339,6 @@ function updateState(state: CategoriesState, options: { childShow?: boolean, par/></UiItem1></UiTabs1>-- <!-- <UiTabs1>- <UiTabsItem4- :isActive="statConfig.config.value.catsList.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.catsList.isGrouped = true"- >- <Icon- name="lucide:network"- :size="16"- />- {{ t('stat.config.categories.grouping.grouped') }}- </UiTabsItem4>-- <UiTabsItem4- :isActive="!statConfig.config.value.catsList.isGrouped"- class="flex gap-1"- @click="statConfig.config.value.catsList.isGrouped = false"- >- <Icon- name="lucide:folder-tree"- :size="16"- />- {{ t('stat.config.categories.grouping.ungrouped') }}- </UiTabsItem4>- </UiTabs1> --></div></div>diff --git a/app/components/stat/chart/Wrap.vue b/app/components/stat/chart/Wrap.vueindex 828d18cf..4d902767 100644--- a/app/components/stat/chart/Wrap.vue+++ b/app/components/stat/chart/Wrap.vue@@ -50,7 +50,7 @@ function onChangePeriod(period: Period) {:class="{'md:max-w-lg': props.chartView === 'half',}"- class="mb-3 rounded-xl border border-item-4 bg-item-2 p-2"+ class="bg-item-2 mb-3 rounded-xl p-2"><divv-if="statConfig.config.value?.chartShow"@@ -60,7 +60,7 @@ function onChangePeriod(period: Period) {<slot /><StatChartIntervals- :class="{ 'border-l border-item-4': statConfig.config.value?.date.isShowQuick }"+ :class="{ 'border-item-4 border-l': statConfig.config.value?.date.isShowQuick }":period="statDate.params.value.intervalsBy":range="statDate.range.value"@onChangePeriod="onChangePeriod"diff --git a/app/components/stat/trns/Section.vue b/app/components/stat/trns/Section.vueindex 9914f01e..75f9e3b5 100644--- a/app/components/stat/trns/Section.vue+++ b/app/components/stat/trns/Section.vue@@ -15,7 +15,7 @@ defineProps<{v-if="selectedTrnsIds.length > 0":storageKey="`${storageKey}-${type}trns-all`":initStatus="true"- class="@3xl/page:p-3 mb-4 rounded-xl border border-item-4 bg-item-2 p-2 md:max-w-lg"+ class="mb-4 md:max-w-lg"><template #header="{ toggle, isShown }"><div class="flex items-center justify-between">diff --git a/app/components/ui/HeaderTitle.vue b/app/components/ui/HeaderTitle.vueindex 9bc23abe..208d9123 100644--- a/app/components/ui/HeaderTitle.vue+++ b/app/components/ui/HeaderTitle.vue@@ -1,8 +1,8 @@<template><divclass="- @lg:text-xl flex min-h-[30px] grow items-center gap-2 px-0.5 font-tertiary text-lg font-semibold leading-none- text-3+ @lg:text-xl font-tertiary text-3 flex min-h-[30px] grow items-center gap-2 px-0.5 text-lg font-semibold+ leading-none tracking-wide"><slot />diff --git a/app/components/ui/Logo.vue b/app/components/ui/Logo.vueindex f88bd922..3bb3885d 100644--- a/app/components/ui/Logo.vue+++ b/app/components/ui/Logo.vue@@ -1,5 +1,5 @@<template>- <div class="font-tertiary text-2xl font-bold first-letter:text-accent-1">+ <div class="font-brand first-letter:text-accent-1 text-2xl font-bold">{{ $t('appName') }}</div></template>diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vueindex 5c5a63a8..370fc834 100644--- a/app/components/wallets/Item.vue+++ b/app/components/wallets/Item.vue@@ -81,7 +81,7 @@ if (!props.isSort) {<!-- Main --><template v-if="!props.alt"><div class="grid grow gap-1">- <div class="text-sm leading-none text-3">+ <div class="text-3 text-sm leading-none">{{ wallet.name }}</div>@@ -154,7 +154,7 @@ if (!props.isSort) {<!-- Alternative --><template v-if="props.alt"><div class="grid grow gap-0.5">- <div class="whitespace-nowrap text-sm leading-none text-3">+ <div class="text-2 whitespace-nowrap text-xs leading-none">{{ wallet.name }}</div>@@ -182,7 +182,7 @@ if (!props.isSort) {<divv-if="isSort"- class="sortHandle flex-center absolute right-0 h-full rounded-md px-3 group-hocus:bg-item-5"+ class="sortHandle flex-center group-hocus:bg-item-5 absolute right-0 h-full rounded-md px-3"><Icon name="lucide:grip-vertical" size="20" /></div>diff --git a/tailwind.config.ts b/tailwind.config.tsindex cf592699..1bc5e5b7 100644--- a/tailwind.config.ts+++ b/tailwind.config.ts@@ -56,9 +56,10 @@ export default <Partial<Config>>{},},fontFamily: {- primary: 'Inter, sans-serif',- secondary: 'Unica One, Inter, sans-serif',- tertiary: 'Nunito, Inter, sans-serif',+ brand: 'Nunito, Roboto, sans-serif',+ primary: 'Roboto, sans-serif',+ secondary: 'Unica One, Roboto, sans-serif',+ tertiary: 'Roboto, sans-serif',},fontSize: {'2xs': '10px',