Skip to content

Open source personal finance application

ui: update

ilkomeb995d87f6566
diff --git a/assets/stylus/variables.styl b/assets/stylus/variables.styl
index 43fd3fda..d6fdd424 100644
--- a/assets/stylus/variables.styl
+++ b/assets/stylus/variables.styl
@@ -12,7 +12,7 @@ button-base-1()
align-items center
justify-content center
height 44px
- max-width 420px
+ max-width 280px
margin 0 auto
padding 0 $m9
color var(--color-text-link)
@@ -20,14 +20,13 @@ button-base-1()
text-decoration none
background var(--c-bg-4)
border 1px solid var(--c-bg-4)
- border-radius $m6
+ border-radius $m9
anim()
+media-hover()
color var(--c-text-1)
- border 1px solid var(--c-blue-1)
+ background var(--c-bg-6)
+media(700px)
height 48px
max-width 280px
- border-radius $m9
diff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.styl
index 939e75e1..f96d7069 100644
--- a/assets/stylus/variables/colors-light.styl
+++ b/assets/stylus/variables/colors-light.styl
@@ -48,4 +48,4 @@ html
--color-text-link #0366d6
--color-link-bg #eaeaea
- --color-item-bg #f5f5f5
+ --color-item-bg #eaeaea
diff --git a/components/categories/Modal.vue b/components/categories/Modal.vue
index 91ab39df..2f49ce4e 100644
--- a/components/categories/Modal.vue
+++ b/components/categories/Modal.vue
@@ -182,14 +182,15 @@ Portal(
)
//- TODO: translate
- .header__back(
- v-if="category.parentId"
- @click="$store.dispatch('categories/showCategoryModal', category.parentId)"
- )
- svg(width="24" height="24" fill="currentColor")
- path(d="M17.171 2.937a1.5 1.5 0 0 0-2.343-1.874l2.343 1.874zM8 12l-1.171-.937a1.5 1.5 0 0 0 0 1.874L8 12zm6.829 10.937a1.5 1.5 0 0 0 2.343-1.874l-2.343 1.874zm0-21.874l-8 10 2.343 1.874 8-10-2.343-1.874zm-8 11.874l8 10 2.343-1.874-8-10-2.343 1.874z")
+ .wrap
+ .header__back(
+ v-if="category.parentId"
+ @click="$store.dispatch('categories/showCategoryModal', category.parentId)"
+ )
+ svg(width="24" height="24" fill="currentColor")
+ path(d="M17.171 2.937a1.5 1.5 0 0 0-2.343-1.874l2.343 1.874zM8 12l-1.171-.937a1.5 1.5 0 0 0 0 1.874L8 12zm6.829 10.937a1.5 1.5 0 0 0 2.343-1.874l-2.343 1.874zm0-21.874l-8 10 2.343 1.874 8-10-2.343-1.874zm-8 11.874l8 10 2.343-1.874-8-10-2.343 1.874z")
- | Back to {{ $store.state.categories.items[category.parentId].name }}
+ | Back to {{ $store.state.categories.items[category.parentId].name }}
ModalBottomConfirm(
:description="deleteInfo"
@@ -223,6 +224,9 @@ Portal(
.categories
padding $m6
+.wrap
+ padding 0 $m8
+
.header
flex-grow 1
position relative
@@ -239,10 +243,7 @@ Portal(
&__back
button-base-1()
- margin $m8 $m7 $m5 $m7
-
- +media(700px)
- margin $m8 auto $m5 auto
+ margin $m8 auto $m5 auto
svg
display none
diff --git a/components/layout/index/Categories.vue b/components/categories/Page.vue
similarity index 100%
rename from components/layout/index/Categories.vue
rename to components/categories/Page.vue
diff --git a/components/categories/item/CategoryItem.vue b/components/categories/item/CategoryItem.vue
index b2107aac..bb3d823f 100644
--- a/components/categories/item/CategoryItem.vue
+++ b/components/categories/item/CategoryItem.vue
@@ -82,6 +82,7 @@ export default {
padding $m6
color var(--c-font-1)
background var(--color-item-bg)
+ border 1px solid transparent
border-radius $m5
anim()
diff --git a/components/layout/Base.vue b/components/layout/Base.vue
index 0b859f0e..36e733d5 100644
--- a/components/layout/Base.vue
+++ b/components/layout/Base.vue
@@ -66,13 +66,13 @@ export default {
.page(
v-show="activeTabViewName === 'categories'"
:style="{ zIndex: activeTabViewName === 'categories' ? 10 : 0 }"
- ): LayoutIndexCategories
+ ): CategoriesPage
//- Wallets
.page(
v-show="activeTabViewName === 'wallets'"
:style="{ zIndex: activeTabViewName === 'wallets' ? 10 : 0 }"
- ): WalletsPageMobile
+ ): WalletsPage
//- Analytics
//-----------------------------
diff --git a/components/wallets/PageMobile.vue b/components/wallets/Page.vue
similarity index 71%
rename from components/wallets/PageMobile.vue
rename to components/wallets/Page.vue
index 2b1c98a5..ab344d17 100644
--- a/components/wallets/PageMobile.vue
+++ b/components/wallets/Page.vue
@@ -14,6 +14,7 @@ export default {
<template lang="pug">
LayoutComponentWrap(:contentPadding="false")
template(slot="content")
+ .header {{ $t('wallets.name') }}
WalletsTotal
WalletsList3(
:limit="6"
@@ -24,22 +25,22 @@ LayoutComponentWrap(:contentPadding="false")
template(slot="bottom")
.buttons
.button(@click="$store.dispatch('ui/setActiveTab', 'createWallet')") {{ $t('wallets.new') }}
- //- SharedButton(
- //- :title="$t('wallets.new')"
- //- className="_inline _small"
- //- @onClick="$store.dispatch('ui/setActiveTab', 'createWallet')"
- //- )
.button(@click="$store.dispatch('ui/setActiveTab', 'walletsSort')") {{ $t('base.sort') }}
- //- SharedButton(
- //- :title="$t('base.sort')"
- //- className="_inline _small"
- //- @onClick="$store.dispatch('ui/setActiveTab', 'walletsSort')"
- //- )
</template>
<style lang="stylus" scoped>
@import '~assets/stylus/variables'
+.header
+ padding 60px 0
+ font-h1()
+ font-size 22px
+ font-weight 600
+ text-align center
+
+ +media-laptop()
+ font-size 28px
+
.buttons
display flex
align-items center
diff --git a/components/wallets/item/walletItem.styl b/components/wallets/item/walletItem.styl
index 3bea9465..9c7a4208 100644
--- a/components/wallets/item/walletItem.styl
+++ b/components/wallets/item/walletItem.styl
@@ -3,13 +3,15 @@
margin-top -1px
padding 0 $m7
padding-top $m6
+ border 1px solid transparent
@media $media-laptop
padding 0 $m8
padding-top $m6
+media-hover()
- background var(--c-bg-6)
+ color var(--c-text-1)
+ border 1px solid var(--c-blue-1)
&__grid
display grid
diff --git a/components/wallets/total/WalletsTotal.vue b/components/wallets/total/WalletsTotal.vue
index 04ff4ac2..ccec7d7b 100644
--- a/components/wallets/total/WalletsTotal.vue
+++ b/components/wallets/total/WalletsTotal.vue
@@ -64,7 +64,6 @@ export default {
flex-wrap wrap
align-items center
justify-content center
- padding 22px 0
padding-bottom 16px
&__item