Skip to content

Open source personal finance application

Refactor code and styles

ilkome51e953edda49
diff --git a/src/components/layout/PeriodNavMobile.vue b/src/components/layout/PeriodNavMobile.vue
index f3aab57b..4d2072dd 100644
--- a/src/components/layout/PeriodNavMobile.vue
+++ b/src/components/layout/PeriodNavMobile.vue
@@ -21,14 +21,14 @@ export default {
</script>
<template lang="pug">
-.period-nav
- .period-nav__link
+.periodNav
+ .periodNav__link
.d-button-cirle(
@click="$store.dispatch('setPeriodPrev')"
:class="{ _disable: $store.state.filter.period === 'all' || $store.getters.isFirstPeriodSelected }")
.mdi.mdi-chevron-left
- .period-nav__link._grow
+ .periodNav__link._grow
ContextMenu(
:position="{ left: true, bottom: true }"
:visible="visiblePeriodMenu"
@@ -65,12 +65,12 @@ export default {
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
ContextMenuItem(
icon="mdi mdi-database"
- :title="$store.state.lang.lang === 'ru' ? 'Показать всё' : 'Show all'"
+ :title="$lang.dates.all"
:selected="$store.state.filter.period === 'all'"
v-on:onClick="$store.dispatch('setPeriod', 'all')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
- .period-nav__link
+ .periodNav__link
.d-button-cirle(
@click="$store.dispatch('setPeriodNext')"
:class="{ _disable: $store.state.filter.period === 'all' || $store.getters.isLastPeriodSelected }")
@@ -81,7 +81,7 @@ export default {
@import "~@/stylus/variables/margins"
@import "~@/stylus/variables/media"
-.period-nav
+.periodNav
display flex
align-items stretch
justify-content space-between
diff --git a/src/components/settings/Settings.vue b/src/components/settings/Settings.vue
index 858a33b8..6ab1186c 100644
--- a/src/components/settings/Settings.vue
+++ b/src/components/settings/Settings.vue
@@ -35,7 +35,7 @@ export default {
.settings
.settings__header {{ $lang.settings.title }}
- .settings__group(v-if="$store.state.ui.mobile")
+ .settings__group
.settings__subHeader {{ $lang.trnForm.title }}
.settings__item
Button._bdb(
diff --git a/src/components/shared/button/Button.vue b/src/components/shared/button/Button.vue
index 0de56ade..f44222ec 100644
--- a/src/components/shared/button/Button.vue
+++ b/src/components/shared/button/Button.vue
@@ -110,6 +110,7 @@ export default {
justify-content center
font-header-2()
font-size 14px
+ height 47px
color var(--c-font-1)
font-weight 600
letter-spacing 1.6px
diff --git a/src/components/wallets/item/walletItem.styl b/src/components/wallets/item/walletItem.styl
index f1810e96..594c05dd 100644
--- a/src/components/wallets/item/walletItem.styl
+++ b/src/components/wallets/item/walletItem.styl
@@ -101,8 +101,6 @@
&__name
min-height 16px
overflow hidden
- text-overflow ellipsis
- white-space nowrap
padding-bottom $m5
fs-m()
@@ -134,8 +132,6 @@
&__name
min-height 16px
overflow hidden
- text-overflow ellipsis
- white-space nowrap
padding-bottom $m5
fs-m()
diff --git a/src/components/wallets/list/walletsList.styl b/src/components/wallets/list/walletsList.styl
index 60158ecd..0c2ff547 100644
--- a/src/components/wallets/list/walletsList.styl
+++ b/src/components/wallets/list/walletsList.styl
@@ -23,7 +23,7 @@
margin-left $m7
margin-right $m7
padding $m7 0
- font-size 13px
+ font-size 12px
color var(--c-font-4)
border 1px solid transparent
diff --git a/src/stylus/variables/media.styl b/src/stylus/variables/media.styl
index 25d660fa..36b5b961 100644
--- a/src/stylus/variables/media.styl
+++ b/src/stylus/variables/media.styl
@@ -1,7 +1,7 @@
$media-phone = "(max-width: 767px)"
$media-phone-sm = "(max-width: 360px)"
$media-phone-normal = "(min-width: 360px)"
-$media-laptop = "(min-width: 768px)"
+$media-laptop = "(min-width: 1000px)"
$media-pc = "(min-width: 1024px)"
$media-xl = "(min-width: 1500px)"
-$media-xl = "(min-width: 1500px)"
+$media-xl2 = "(min-width: 1800px)"