From 22d5862afb1982c60d1c58f6570e8db132f38821 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 31 Oct 2018 18:07:00 +0900 Subject: [PATCH] :art: --- .../common/views/components/mute-and-block.vue | 8 ++------ .../app/common/views/components/ui/info.vue | 16 +++++++++++++--- .../desktop/views/components/settings.apps.vue | 4 +--- src/client/theme/dark.json5 | 2 ++ src/client/theme/light.json5 | 2 ++ 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/mute-and-block.vue index b244f975bb..8aac74c4e2 100644 --- a/src/client/app/common/views/components/mute-and-block.vue +++ b/src/client/app/common/views/components/mute-and-block.vue @@ -4,9 +4,7 @@
%i18n:@mute%
- -

%i18n:@no-muted-users%

-
+ %i18n:@no-muted-users%

{{ user | userName }} @{{ user | acct }}

@@ -16,9 +14,7 @@
%i18n:@block%
- -

%i18n:@no-blocked-users%

-
+ %i18n:@no-blocked-users%

{{ user | userName }} @{{ user | acct }}

diff --git a/src/client/app/common/views/components/ui/info.vue b/src/client/app/common/views/components/ui/info.vue index e2ea1d7164..3d62a3c7aa 100644 --- a/src/client/app/common/views/components/ui/info.vue +++ b/src/client/app/common/views/components/ui/info.vue @@ -1,6 +1,7 @@ @@ -23,11 +24,20 @@ export default Vue.extend({ margin 16px 0 padding 16px font-size 90% - - > i - margin-right 4px + background var(--infoBg) + color var(--infoFg) &.warn background var(--infoWarnBg) color var(--infoWarnFg) + + &:first-child + margin-top 0 + + &:last-child + margin-bottom 0 + + > i + margin-right 4px + diff --git a/src/client/app/desktop/views/components/settings.apps.vue b/src/client/app/desktop/views/components/settings.apps.vue index 7d562f9c11..bf8faf250e 100644 --- a/src/client/app/desktop/views/components/settings.apps.vue +++ b/src/client/app/desktop/views/components/settings.apps.vue @@ -1,8 +1,6 @@