Skip to content

Open source personal finance application

Cleanup

Ilya Komichevcf9435a6d333
diff --git a/src/components/shared/button/Button.vue b/src/components/shared/button/Button.vue
index 4928cf23..45b4efdd 100644
--- a/src/components/shared/button/Button.vue
+++ b/src/components/shared/button/Button.vue
@@ -81,8 +81,8 @@ export default {
width 100%
display flex
align-items center
- min-height 40px
- padding $m7 $m9
+ // min-height 40px
+ padding $m7 $m8
color var(--c-font-2)
cursor pointer
anim-background()
@@ -94,7 +94,7 @@ export default {
display inline-flex
align-items center
justify-content center
- height 52px
+ // height 52px
font-header-2()
font-size 16px
color var(--c-font-1)
@@ -107,21 +107,36 @@ export default {
@media $media-laptop
background var(--c-blue-2)
+ &._bdb
+ border-bottom 1px solid var(--c-bg-5)
+ &:hover
+ @media $media-laptop
+ background var(--c-bg-5)
+ &:active
+ background var(--c-bg-5)
+
&._inline
display inline-flex
width auto
+ &._center
+ align-items center
+ justify-content center
+
&._grey
background var(--c-bg-5)
color var(--c-font-2)
border-radius $m3
/.theme-light &
- background var(--c-bg-1)
+ color var(--c-font-1)
+ background var(--c-bg-12)
&:hover
@media $media-laptop
background var(--c-bg-6)
+ /.theme-light &
+ background var(--c-bg-13)
&._small
height 40px
@@ -146,10 +161,10 @@ export default {
border-color var(--c-bg-8)
&__icon
- display flex
- align-items center
- justify-content center
- font-size 22px
- padding-right $m6
- opacity .8
+ width 24px
+ margin-left (- $m4)
+ margin-right $m6
+ font-size 20px
+ text-align center
+ opacity .85
</style>
diff --git a/src/components/stat/StatChartsLine.vue b/src/components/stat/StatChartsLine.vue
index 8093fcf8..2c34af83 100644
--- a/src/components/stat/StatChartsLine.vue
+++ b/src/components/stat/StatChartsLine.vue
@@ -179,43 +179,46 @@ export default {
</script>
<template lang="pug">
-.charts(v-if="$store.state.ui.statGraphsVisible && $store.state.filter.period !== 'all'")
- .charts__nav
- ChartMenu
-
- .charts__content
- //- grouped
- template(v-if="periods[filterPeriod].grouped")
- .charts__items._grouped
- template(v-for="(periodGroups, groupDate) in periodsGroupedValues")
- .chart-group(:class="{ _grouped: periods[filterPeriod].grouped }")
- .chart-group__name(v-show="periods[filterPeriod].grouped")
- template(v-if="periods[filterPeriod].grouped") {{ formatGroupName(groupDate, periods[filterPeriod].groupedBy) }}
-
- .chart-group__content
- template(v-for="period in periodGroups")
- ChartItem(
- :key="period.date"
- :maxAmountValue="maxAmountValue"
- :period="period"
- parentClassName=".charts__items"
- )
- .chart-space
-
- //- simple
- template(v-else)
- .charts__items
- template(v-for="period in periodsValues")
- ChartItem(
- :key="period.date"
- :maxAmountValue="maxAmountValue"
- :period="period"
- parentClassName=".charts__items"
- )
-
- //- popup
- template(v-if="$store.state.ui.pc && $store.state.chart.hoveredPeriod.values")
- ChartPopup(v-if="")
+.charts(v-if="$store.state.ui.statGraphsVisible")
+ template(v-if="$store.state.filter.period === 'all'")
+ .charts__allData Change period to see chart
+ template(v-if="$store.state.filter.period !== 'all'")
+ .charts__nav
+ ChartMenu
+
+ .charts__content
+ //- grouped
+ template(v-if="periods[filterPeriod].grouped")
+ .charts__items._grouped
+ template(v-for="(periodGroups, groupDate) in periodsGroupedValues")
+ .chart-group(:class="{ _grouped: periods[filterPeriod].grouped }")
+ .chart-group__name(v-show="periods[filterPeriod].grouped")
+ template(v-if="periods[filterPeriod].grouped") {{ formatGroupName(groupDate, periods[filterPeriod].groupedBy) }}
+
+ .chart-group__content
+ template(v-for="period in periodGroups")
+ ChartItem(
+ :key="period.date"
+ :maxAmountValue="maxAmountValue"
+ :period="period"
+ parentClassName=".charts__items"
+ )
+ .chart-space
+
+ //- simple
+ template(v-else)
+ .charts__items
+ template(v-for="period in periodsValues")
+ ChartItem(
+ :key="period.date"
+ :maxAmountValue="maxAmountValue"
+ :period="period"
+ parentClassName=".charts__items"
+ )
+
+ //- popup
+ template(v-if="$store.state.ui.pc && $store.state.chart.hoveredPeriod.values")
+ ChartPopup(v-if="")
</template>
<style lang="stylus" scoped>
@@ -232,7 +235,17 @@ export default {
border-bottom 1px solid var(--c-bg-1)
@media $media-laptop
- min-height 160px
+ min-height 178px
+
+ &__allData
+ display flex
+ align-items center
+ justify-content center
+ font-size 14px
+ opacity .7
+
+ @media $media-laptop
+ min-height 178px
&__items
scrollbar()
diff --git a/src/components/stat/StatPc.vue b/src/components/stat/StatPc.vue
index 1e8811ae..a3c2aea5 100644
--- a/src/components/stat/StatPc.vue
+++ b/src/components/stat/StatPc.vue
@@ -66,7 +66,7 @@ export default {
.stat
position relative
- padding 0 $m10
+ padding 0 $mb2
&__content
display grid
@@ -76,11 +76,10 @@ export default {
grid-column-gap $mb1
@media $media-xl
- grid-column-gap $mb2
+ grid-column-gap 150px
&__item
flex 1 1 450px
- padding 0 24px
padding-top $m9
&__chart
diff --git a/src/components/stat/StatSummaryPc.vue b/src/components/stat/StatSummaryPc.vue
index 1532000f..836b1abd 100644
--- a/src/components/stat/StatSummaryPc.vue
+++ b/src/components/stat/StatSummaryPc.vue
@@ -104,22 +104,22 @@ export default {
@media $media-pc
display grid
grid-template-columns repeat(3, 1fr)
- grid-column-gap $m9
+ grid-column-gap 120px
padding 0
&__item
- flex 1
+ flex-grow 0
display flex
flex-flow column
justify-content center
margin $m5 $m7
- padding $m3 $m8
+ padding $m3 $m9
padding-right 0
@media $media-phone
border-bottom 1px solid var(--c-bg-5)
@media $media-pc
- max-width 280px
+ // max-width 280px
margin 0
&._expenses
@@ -127,17 +127,20 @@ export default {
@media $media-phone
order 1
- &._incomes
- border-left 2px solid rgba(44, 173, 34, .5)
- @media $media-phone
- order 2
-
&._total
+ align-self center
border-left 2px solid var(--c-bg-5)
@media $media-phone
order 3
+ &._incomes
+ align-self end
+ border-left 2px solid rgba(44, 173, 34, .5)
+ @media $media-phone
+ order 2
+
&__row
+ flex-grow 0
display flex
align-items center
justify-content space-between
diff --git a/src/components/ui/store/index.js b/src/components/ui/store/index.js
index ec3e7e5c..3aaf280d 100644
--- a/src/components/ui/store/index.js
+++ b/src/components/ui/store/index.js
@@ -10,7 +10,7 @@ const state = {
prevTab: null,
statGraphsVisible: true,
lastUsedCatsInTrnForm: 'hidden',
- lastTrns: 'visible',
+ lastTrns: 'hidden',
catsChart: 'visible',
statItems: 'visible',
stat: {
diff --git a/src/components/wallets/total/WalletsTotal.vue b/src/components/wallets/total/WalletsTotal.vue
index 700cf192..df92baf9 100644
--- a/src/components/wallets/total/WalletsTotal.vue
+++ b/src/components/wallets/total/WalletsTotal.vue
@@ -45,15 +45,14 @@ export default {
Amount(
:currency="$store.state.currencies.base"
:value="totalInWallets.counted"
- :alwaysShowSymbol="true"
- )
+ :alwaysShowSymbol="true")
+
.wallets-total__item(v-if="totalInWallets.all > 0")
.wallets-total__title Also
.wallets-total__value
Amount(
:currency="$store.state.currencies.base"
- :value="totalInWallets.all"
- )
+ :value="totalInWallets.all")
</template>
<style lang="stylus" scoped>