From fb1d727db95816182a0184bf449051ff94694bac Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 22 Jun 2018 13:20:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?trifling=20style=20changes=20=E6=8A=95?= =?UTF-8?q?=E7=A8=BF=E3=81=AE=E3=82=BF=E3=82=B0=E3=81=AE=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=B3=E3=81=A8=E8=89=B2=E3=81=AE=E6=9C=80=E9=81=A9?= =?UTF-8?q?=E5=8C=96=20=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AE=E4=BF=AE=E6=AD=A3(=E5=B9=85?= =?UTF-8?q?=E3=81=8C=E4=BC=B8=E3=81=B3=E3=82=8B=E3=80=81profile=E3=81=AE?= =?UTF-8?q?=E8=89=B2)=20=E3=82=A6=E3=82=A7=E3=83=AB=E3=82=AB=E3=83=A0?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E4=BF=AE=E6=AD=A3(?= =?UTF-8?q?=E3=83=80=E3=83=BC=E3=82=AF=E3=83=A2=E3=83=BC=E3=83=89=E6=99=82?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/desktop/views/components/notes.note.vue | 4 ++-- .../app/desktop/views/pages/deck/deck.note.vue | 4 ++-- .../desktop/views/pages/user/user.profile.vue | 16 ++++++++-------- src/client/app/desktop/views/pages/user/user.vue | 3 ++- src/client/app/desktop/views/pages/welcome.vue | 2 +- src/client/app/mobile/views/components/note.vue | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index b96ae2da5..3727d7d27 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -473,10 +473,10 @@ root(isDark) > * display inline-block - margin 0 8px 0 0 + margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #8d969e + color #f66e4f background isDark ? #313543 : #edf0f3 border-radius 4px diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue index d50fc3c23..8b014fe94 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -381,10 +381,10 @@ root(isDark) > * display inline-block - margin 0 8px 0 0 + margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #8d969e + color #f66e4f background isDark ? #313543 : #edf0f3 border-radius 4px diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue index 8afa7122b..21f3c57c7 100644 --- a/src/client/app/desktop/views/pages/user/user.profile.vue +++ b/src/client/app/desktop/views/pages/user/user.profile.vue @@ -126,7 +126,7 @@ root(isDark) > .friend-form padding 16px text-align center - border-top solid 1px #eee + border-bottom solid 1px isDark ? #21242f : #eee > .followed margin 12px 0 0 0 @@ -144,7 +144,7 @@ root(isDark) > .action-form padding 16px text-align center - border-top solid 1px #eee + border-bottom solid 1px isDark ? #21242f : #eee > * width 100% @@ -154,8 +154,8 @@ root(isDark) > .birthday padding 16px - color #555 - border-top solid 1px #eee + color isDark ? #e3e7ea : #555 + border-bottom solid 1px isDark ? #21242f : #eee > p margin 0 @@ -165,8 +165,8 @@ root(isDark) > .twitter padding 16px - color #555 - border-top solid 1px #eee + color isDark ? #e3e7ea : #555 + border-bottom solid 1px isDark ? #21242f : #eee > p margin 0 @@ -176,8 +176,8 @@ root(isDark) > .status padding 16px - color #555 - border-top solid 1px #eee + color isDark ? #e3e7ea : #555 + border-bottom solid 1px isDark ? #21242f : #eee > p margin 8px 0 diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue index 7f05c695a..c8a04c6b0 100644 --- a/src/client/app/desktop/views/pages/user/user.vue +++ b/src/client/app/desktop/views/pages/user/user.vue @@ -92,7 +92,7 @@ root(isDark) &.is-suspended color isDark ? #ffb4b4 : #570808 background isDark ? #611d1d : #ffdbdb - border solid 1px isDarl ? #d64a4a : #e09696 + border solid 1px isDark ? #d64a4a : #e09696 &.is-remote color isDark ? #ffbd3e : #573c08 @@ -105,6 +105,7 @@ root(isDark) > main display flex justify-content center + width 673px > .main > .side diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 029e44e27..2203efcc9 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -199,7 +199,7 @@ root(isDark) > .login width $loginWidth padding 16px 32px 32px 32px - background #f5f5f5 + background isDark ? #2e3440 : #f5f5f5 > .info margin 16px auto diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index ecdfee3b4..76ac9a131 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -424,10 +424,10 @@ root(isDark) > * display inline-block - margin 0 8px 0 0 + margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #8d969e + color #f66e4f background isDark ? #313543 : #edf0f3 border-radius 4px From 6f38c6f33999b64d06f2aab657e6b1efc9cfea91 Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 22 Jun 2018 13:37:46 +0900 Subject: [PATCH 2/2] $theme-color --- src/client/app/desktop/views/components/notes.note.vue | 2 +- src/client/app/desktop/views/pages/deck/deck.note.vue | 2 +- src/client/app/mobile/views/components/note.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 3727d7d27..6f466e576 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -476,7 +476,7 @@ root(isDark) margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #f66e4f + color $theme-color background isDark ? #313543 : #edf0f3 border-radius 4px diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue index 8b014fe94..617f633f5 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -384,7 +384,7 @@ root(isDark) margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #f66e4f + color $theme-color background isDark ? #313543 : #edf0f3 border-radius 4px diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index 76ac9a131..bd0a0d1b5 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -427,7 +427,7 @@ root(isDark) margin 0 0 4px 6px padding 2px 8px 2px 16px font-size 90% - color #f66e4f + color $theme-color background isDark ? #313543 : #edf0f3 border-radius 4px