Skip to content

Commit 2c396ef

Browse files
committed
feat: minor ui modernization
1 parent bc9d692 commit 2c396ef

File tree

15 files changed

+42
-28
lines changed

15 files changed

+42
-28
lines changed

src/app/components/base/button/Button.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const classes = computed(() => [
7575
cursor: pointer;
7676
background: v-bind('theme.color.base');
7777
color: v-bind('theme.text.base');
78-
border-radius: var(--border-radius-m);
78+
border-radius: var(--border-radius-full);
7979
transition: all var(--transition-s);
8080
padding: 10px;
8181

src/app/components/base/form/Form.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<form :class="$style.fields" action="#" @submit="submit">
33
<slot />
4-
<Button :class="$style.btn" :text="submitLabel" color="success" type="submit" />
4+
<Button :class="$style.btn" :text="submitLabel" type="submit" />
55
</form>
66
</template>
77

src/app/components/charts/line-chart/LineChart.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const options = computed(
3838
left: '3%',
3939
right: '4%',
4040
bottom: '3%',
41+
top: '35px',
4142
containLabel: true
4243
},
4344
xAxis: {

src/app/pages/dashboard/overview/widgets/header-panels/SummaryPanel.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ const element = computed(() => (props.to ? Link : 'div'));
6666
.summaryPanel {
6767
display: flex;
6868
justify-content: space-between;
69-
gap: 2px;
7069
padding: 30px;
7170
width: 100%;
7271
height: 100%;

src/app/pages/dashboard/summary/Summary.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:import="() => import('./widgets/charts/DevelopmentChart.vue')"
77
/>
88

9-
<TotalsSummaryTable :title="t('page.dashboard.summary')" :income="income" :expenses="expenses" />
9+
<TotalsSummaryTable :income="income" :expenses="expenses" />
1010
<GroupsSummaryTable :title="t('page.dashboard.income')" :groups="state.income" />
1111
<GroupsSummaryTable :title="t('page.dashboard.expenses')" :groups="state.expenses" />
1212
</div>

src/app/pages/dashboard/summary/widgets/tables/GroupsSummaryTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
:key="month"
99
:class="[$style.bold, { [$style.currentMonth]: isCurrentMonth(index) }]"
1010
>
11-
{{ month }}
11+
<span>{{ month }}</span>
1212
</span>
1313
<span :class="$style.bold">{{ t('shared.total') }}</span>
1414
<span :class="$style.bold">{{ t('shared.average') }}</span>

src/app/pages/dashboard/summary/widgets/tables/SummaryTable.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div :class="$style.summaryTable">
3-
<h1 :class="$style.title">{{ title }}</h1>
3+
<h1 v-if="title" :class="$style.title">{{ title }}</h1>
44

55
<div :class="$style.table">
66
<slot />
@@ -10,7 +10,7 @@
1010

1111
<script lang="ts" setup>
1212
defineProps<{
13-
title: string;
13+
title?: string;
1414
}>();
1515
</script>
1616

@@ -29,8 +29,8 @@ defineProps<{
2929
}
3030
3131
.table {
32-
padding: 10px;
33-
border: 2px solid var(--app-border);
32+
padding: 8px;
33+
background: var(--c-dimmed-light);
3434
border-radius: var(--border-radius-xxl);
3535
overflow: auto;
3636

src/app/pages/dashboard/summary/widgets/tables/TotalsSummaryTable.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<template>
2-
<SummaryTable :title="title">
2+
<SummaryTable>
33
<div :class="$style.table">
44
<!-- Header -->
55
<span />
66
<span
77
v-for="(month, index) of months"
88
:key="month"
99
:class="[$style.bold, { [$style.currentMonth]: isCurrentMonth(index) }]"
10-
>{{ month }}</span
1110
>
11+
<span>{{ month }}</span>
12+
</span>
1213
<span :class="$style.bold">{{ t('shared.total') }}</span>
1314
<span :class="$style.bold">{{ t('shared.average') }}</span>
1415

@@ -75,7 +76,6 @@ const props = withDefaults(
7576
defineProps<{
7677
income?: number[];
7778
expenses?: number[];
78-
title: string;
7979
}>(),
8080
{
8181
income: () => [],

src/app/pages/dashboard/summary/widgets/tables/_shared.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,20 @@
2323
color: var(--theme-text-muted);
2424
}
2525

26-
.currentMonth {
27-
color: var(--c-primary-pure);
26+
.currentMonth > span {
27+
color: var(--c-text-light);
28+
display: inline-block;
29+
position: relative;
30+
z-index: 0;
31+
32+
&::before {
33+
content: '';
34+
position: absolute;
35+
inset: -3px -8px;
36+
border-radius: 100px;
37+
background: var(--c-primary);
38+
z-index: -1;
39+
}
2840
}
2941

3042
.current {

src/app/pages/shared/BudgetGroup.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
<!-- Footer -->
7373
<span />
74-
<Button icon="plus" textual color="success" @click="addBudget(group.id)" />
74+
<Button icon="plus" textual @click="addBudget(group.id)" />
7575
<span style="grid-column: 3 / 16" />
7676
<Currency :class="[$style.meta, $style.bold]" :value="totalAmount" />
7777
<Currency :class="[$style.meta, $style.bold]" :value="averageAmount" />
@@ -200,15 +200,15 @@ const performAction = (action: CellMenuActionId, budgetId: string, month: number
200200
}
201201
202202
&.start {
203-
border-top-left-radius: var(--border-radius-m);
204-
border-bottom-left-radius: var(--border-radius-m);
203+
border-top-left-radius: var(--border-radius-l);
204+
border-bottom-left-radius: var(--border-radius-l);
205205
padding-left: 8px;
206206
cursor: text;
207207
}
208208
209209
&.end {
210-
border-top-right-radius: var(--border-radius-m);
211-
border-bottom-right-radius: var(--border-radius-m);
210+
border-top-right-radius: var(--border-radius-l);
211+
border-bottom-right-radius: var(--border-radius-l);
212212
padding-right: 8px;
213213
}
214214
}

0 commit comments

Comments
 (0)