Skip to content

Open source personal finance application

ui: update colors

ilkome86c91e2b6bbb
diff --git a/assets/stylus/variables/colors-dark.styl b/assets/stylus/variables/colors-dark.styl
index 7c2809a1..82b7a83a 100644
--- a/assets/stylus/variables/colors-dark.styl
+++ b/assets/stylus/variables/colors-dark.styl
@@ -48,8 +48,12 @@ html.dark-mode
--c-item-bd-main #3f3f3f
--c-item-bg-hover #232323
--c-item-bd-hover #3f3f3f
+ --c-item-bg-active #232323
--c-item2-bg-hover #1c1c1c
--c-item2-bd-hover #3f3f3f
--c-item3-bg-hover #272727
+
+ --c-item-stat-bg rgba(35, 35, 35, 1)
+ --c-item-stat-icon rgba(250, 250, 250, 1)
diff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.styl
index 2f3a31cb..8c6d7f00 100644
--- a/assets/stylus/variables/colors-light.styl
+++ b/assets/stylus/variables/colors-light.styl
@@ -48,11 +48,15 @@ html
--color-text-link #0366d6
--color-link-bg #eaeaea
- --c-item-bg-main #f2f2f2
+ --c-item-bg-main #f5f6f8
--c-item-bg-hover #ebebeb
- --c-item-bd-hover #bebebe
+ --c-item-bd-hover #3a7dff82
+ --c-item-bg-active #edeef0
- --c-item2-bg-hover #fafafa
+ --c-item2-bg-hover #f5f6f8
--c-item2-bd-hover #bebebe
--c-item3-bg-hover rgba(235, 235, 235, 1)
+
+ --c-item-stat-bg #ebebeb
+ --c-item-stat-icon rgba(250, 250, 250, 1)
diff --git a/components/chart/StatChartLines.vue b/components/chart/StatChartLines.vue
index fd9528c8..61290ec1 100644
--- a/components/chart/StatChartLines.vue
+++ b/components/chart/StatChartLines.vue
@@ -92,7 +92,7 @@ export default {
if (chartSeriesIdx !== -1) {
chart.xAxis[0].update({
plotBands: [{
- color: 'var(--c-bg-7)',
+ color: 'var(--c-item-bg-active)',
from: chartSeriesIdx + 0.5,
to: chartSeriesIdx - 0.5
}]
diff --git a/components/stat/DashboardMenu.vue b/components/stat/DashboardMenu.vue
index f6cd5008..3e12d542 100644
--- a/components/stat/DashboardMenu.vue
+++ b/components/stat/DashboardMenu.vue
@@ -95,5 +95,5 @@ export default {
&._active
cursor default
color var(--c-blue-1)
- background var(--c-item-bg-hover)
+ background var(--c-item-bg-active)
</style>
diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vue
index 56194a4b..3059afc4 100644
--- a/components/stat/StatItem.vue
+++ b/components/stat/StatItem.vue
@@ -72,8 +72,8 @@ export default {
.statItem__graph: .statItem__graph__in(:style="styles")
.statItem__icon(@click.stop="setCategoryFilter(categoryId)")
Icon(
- :background="showInside ? category.color : 'var(--c-bg-5)'"
- :color="showInside ? 'var(--c-font-1)' : category.color"
+ :background="showInside ? category.color : 'var(--c-item-stat-bg)'"
+ :color="showInside ? 'var(--c-item-stat-icon)' : category.color"
:icon="category.icon"
round
)
diff --git a/components/stat/StatItemRound.vue b/components/stat/StatItemRound.vue
index e34a9123..7fa3a719 100644
--- a/components/stat/StatItemRound.vue
+++ b/components/stat/StatItemRound.vue
@@ -90,7 +90,7 @@ export default {
Icon(
:icon="category.icon"
:color="category.color"
- background="var(--c-bg-5)"
+ background="var(--c-item-stat-bg)"
round
)
diff --git a/components/trnForm/TrnFormHeader.vue b/components/trnForm/TrnFormHeader.vue
index 6313a00f..89532512 100644
--- a/components/trnForm/TrnFormHeader.vue
+++ b/components/trnForm/TrnFormHeader.vue
@@ -38,4 +38,7 @@ export default {
right $m4
color var(--c-font-2)
font-size 16px
+
+ /.light-mode &
+ color var(--c-item-stat-icon)
</style>
diff --git a/components/trnForm/TrnFormHeaderItemWallet.vue b/components/trnForm/TrnFormHeaderItemWallet.vue
index 233437f2..a7100b71 100644
--- a/components/trnForm/TrnFormHeaderItemWallet.vue
+++ b/components/trnForm/TrnFormHeaderItemWallet.vue
@@ -20,7 +20,7 @@ export default {
WalletsItemWalletItem(
:id="$store.state.trnForm.values.walletId"
:showBase="false"
- :isAltColor="true"
+ isAltColor
ui="tile"
)
diff --git a/components/trnForm/TrnFormHeaderTransfer.vue b/components/trnForm/TrnFormHeaderTransfer.vue
index 19bfdef0..50c2ccdf 100644
--- a/components/trnForm/TrnFormHeaderTransfer.vue
+++ b/components/trnForm/TrnFormHeaderTransfer.vue
@@ -43,10 +43,11 @@ export default {
//- Wallet from
template(v-if="walletFrom")
.trnFormHeaderItem
- .trnFormHeaderItem__desc From wallet
+ .trnFormHeaderItem__desc {{ $t('trnForm.transfer.fromLong') }}
WalletsItemWalletItem(
:id="walletFromId"
:showBase="false"
+ isAltColor
ui="tile"
@onClick="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
)
@@ -56,10 +57,11 @@ export default {
//- Wallet to
template(v-if="walletTo")
.trnFormHeaderItem
- .trnFormHeaderItem__desc To wallet
+ .trnFormHeaderItem__desc {{ $t('trnForm.transfer.toLong') }}
WalletsItemWalletItem(
:id="walletToId"
:showBase="false"
+ isAltColor
ui="tile"
@onClick="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
)
diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vue
index e4c109a1..5bdeb635 100644
--- a/components/trns/item/TrnItem.vue
+++ b/components/trns/item/TrnItem.vue
@@ -115,11 +115,13 @@ export default {
.trnItem__wallet
WalletsItemWalletItem(
:id="trn.walletFromId"
+ isAltColor
ui="tile"
)
.trnFormHeaderSeparator: .mdi.mdi-chevron-right
WalletsItemWalletItem(
:id="trn.walletToId"
+ isAltColor
ui="tile"
)
.trnItem__amount(@click.stop="setTrnEdit")
@@ -141,6 +143,8 @@ export default {
Icon(
:color="category.color"
:icon="category.icon"
+ background="var(--c-item-stat-bg)"
+ round
)
.trnItem__center
@@ -233,7 +237,7 @@ export default {
Icon(
:color="category.color"
:icon="category.icon"
- background="var(--c-bg-5)"
+ background="var(--c-item-stat-bg)"
round
)
@@ -300,7 +304,7 @@ export default {
+media-hover(true)
&._history
&._stat
- background var(--c-bg-5)
+ background var(--c-item-bg-hover)
border-radius $m5
&__amount
@@ -429,12 +433,7 @@ export default {
color var(--c-font-2)
font-size 14px
- &__amount
- ^[0]._history &
- //
-
&._active
- // &._history
&._trnForm
margin-right - ($m7)
margin-left - ($m7)
diff --git a/locales/en-US.js b/locales/en-US.js
index 5e4ccd4d..98322ece 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -42,7 +42,9 @@ export default {
},
transfer: {
from: 'From',
- to: 'To'
+ fromLong: 'From wallet',
+ to: 'To',
+ toLong: 'To wallet'
}
},
diff --git a/locales/ru-RU.js b/locales/ru-RU.js
index 7db6d3f4..23ab7528 100644
--- a/locales/ru-RU.js
+++ b/locales/ru-RU.js
@@ -43,7 +43,9 @@ export default {
},
transfer: {
from: 'Из',
- to: 'В'
+ fromLong: 'Из кошелька',
+ to: 'В',
+ toLong: 'В кошелек'
}
},
diff --git a/package.json b/package.json
index 05594e0d..066544db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "3.18.5",
+ "version": "3.18.6",
"scripts": {
"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt",
"build": "nuxt build",