From bb0cb0a8664efff534ac4c79d446fdf2cfb2a980 Mon Sep 17 00:00:00 2001
From: Ivan <iVAN2002@users.noreply.github.com>
Date: Wed, 28 Nov 2018 23:02:35 +0300
Subject: [PATCH] Fix bad style in deck column options and other things (#3412)
* Fix wrong text color in empty timeline (#3268)
* Whoops
* Fix wrong text color in deck options (#3268)
* Some padding to make it look less ugly
* Fix wrong text color in user lists menu (#3268)
* Fix wrong text color of footer on welcome screen (mobile) (#3268)
* Fix misalignment of icons and text in menu (mobile) (#3289)
* Fix wrong text color in empty timeline (mobile) (#3268)
---
.../app/common/views/components/menu.vue | 1 +
.../app/common/views/components/ui/switch.vue | 2 +-
.../views/components/user-lists-window.vue | 18 ++++++++++++++
.../views/pages/deck/deck.tl-column.vue | 2 +-
.../views/pages/user/user.timeline.vue | 24 ++++++++++---------
src/client/app/mobile/views/pages/user.vue | 1 +
src/client/app/mobile/views/pages/welcome.vue | 1 +
7 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/client/app/common/views/components/menu.vue b/src/client/app/common/views/components/menu.vue
index e085bf4bb9..56d9480e17 100644
--- a/src/client/app/common/views/components/menu.vue
+++ b/src/client/app/common/views/components/menu.vue
@@ -180,6 +180,7 @@ export default Vue.extend({
padding 8px 16px
width 100%
color var(--popupFg)
+ white-space nowrap
&:hover
color var(--primaryForeground)
diff --git a/src/client/app/common/views/components/ui/switch.vue b/src/client/app/common/views/components/ui/switch.vue
index c9a9cb7911..b8bd9e2fcd 100644
--- a/src/client/app/common/views/components/ui/switch.vue
+++ b/src/client/app/common/views/components/ui/switch.vue
@@ -123,7 +123,7 @@ export default Vue.extend({
> span
display block
line-height 20px
- color currentColor
+ color var(--text)
transition inherit
> p
diff --git a/src/client/app/desktop/views/components/user-lists-window.vue b/src/client/app/desktop/views/components/user-lists-window.vue
index 8c52ea4af2..0677bbe742 100644
--- a/src/client/app/desktop/views/components/user-lists-window.vue
+++ b/src/client/app/desktop/views/components/user-lists-window.vue
@@ -54,7 +54,25 @@ export default Vue.extend({
padding 16px
> button
+ display block
margin-bottom 16px
+ color var(--primaryForeground)
+ background var(--primary)
+ width 100%
+ border-radius 38px
+ user-select none
+ cursor pointer
+ padding 0 16px
+ min-width 100px
+ line-height 38px
+ font-size 14px
+ font-weight 700
+
+ &:hover
+ background var(--primaryLighten10)
+
+ &:active
+ background var(--primaryDarken10)
> a
display block
diff --git a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
index 97d69ae888..bc5e045373 100644
--- a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
@@ -10,7 +10,7 @@
<span>{{ name }}</span>
</span>
- <div class="editor" style="padding:0 12px" v-if="edit">
+ <div class="editor" style="padding:12px" v-if="edit">
<ui-switch v-model="column.isMediaOnly" @change="onChangeSettings">{{ $t('is-media-only') }}</ui-switch>
<ui-switch v-model="column.isMediaView" @change="onChangeSettings">{{ $t('is-media-view') }}</ui-switch>
</div>
diff --git a/src/client/app/desktop/views/pages/user/user.timeline.vue b/src/client/app/desktop/views/pages/user/user.timeline.vue
index 07e22648b9..357a87062b 100644
--- a/src/client/app/desktop/views/pages/user/user.timeline.vue
+++ b/src/client/app/desktop/views/pages/user/user.timeline.vue
@@ -151,18 +151,20 @@ export default Vue.extend({
&:hover
color var(--desktopTimelineSrcHover)
- > .empty
- display block
- margin 0 auto
- padding 32px
- max-width 400px
- text-align center
- color #999
+ > .mk-notes
- > [data-icon]
+ > .empty
display block
- margin-bottom 16px
- font-size 3em
- color #ccc
+ margin 0 auto
+ padding 32px
+ max-width 400px
+ text-align center
+ color var(--text)
+
+ > [data-icon]
+ display block
+ margin-bottom 16px
+ font-size 3em
+ color var(--faceHeaderText);
</style>
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index 1f0551680e..3187f09f47 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -334,6 +334,7 @@ main
max-width 680px
margin 0 auto
padding 8px
+ color var(--text)
@media (min-width 500px)
padding 16px
diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue
index 9f8dfd17d9..acc4eef792 100644
--- a/src/client/app/mobile/views/pages/welcome.vue
+++ b/src/client/app/mobile/views/pages/welcome.vue
@@ -306,6 +306,7 @@ export default Vue.extend({
padding 16px 0
border solid 2px rgba(0, 0, 0, 0.1)
border-radius 8px
+ color var(--text)
> *
margin 0 16px