From d780e5b251c8f4f593f7bece72439e411a3c0b66 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 9 Aug 2020 13:46:19 +0900 Subject: [PATCH 01/33] =?UTF-8?q?enhance(client):=20=E3=83=9F=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=95=E3=82=8C=E3=81=9F=E3=83=8E=E3=83=BC?= =?UTF-8?q?=E3=83=88=E6=95=B0=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=82=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 1 + src/client/components/ui/input.vue | 6 ++--- src/client/components/ui/select.vue | 2 +- src/client/components/ui/textarea.vue | 6 ++--- src/client/pages/my-settings/word-mute.vue | 8 +++++-- src/client/style.scss | 5 +++++ .../endpoints/i/get-word-muted-notes-count.ts | 22 +++++++++++++++++++ 7 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 src/server/api/endpoints/i/get-word-muted-notes-count.ts diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d3891a41a6..c8b34608b5 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -572,6 +572,7 @@ _wordMute: hardDescription: "指定した条件のノートをタイムラインに追加しないようにします。追加されなかったノートは、条件を変更しても除外されたままになります。" soft: "ソフト" hard: "ハード" + mutedNotesCount: "{count}ノートがミュートされました" _theme: explore: "テーマを探す" diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue index d5317db7f9..f9c2d9a43a 100644 --- a/src/client/components/ui/input.vue +++ b/src/client/components/ui/input.vue @@ -64,7 +64,7 @@
-
+
@@ -401,13 +401,11 @@ export default Vue.extend({ > .save { margin: 6px 0 0 0; - font-size: 13px; + font-size: 0.8em; } > .desc { margin: 6px 0 0 0; - font-size: 13px; - opacity: 0.7; &:empty { display: none; diff --git a/src/client/components/ui/select.vue b/src/client/components/ui/select.vue index 55f76553a7..d42560e13a 100644 --- a/src/client/components/ui/select.vue +++ b/src/client/components/ui/select.vue @@ -196,7 +196,7 @@ export default Vue.extend({ > .text { margin: 6px 0; - font-size: 13px; + font-size: 0.8em; &:empty { display: none; diff --git a/src/client/components/ui/textarea.vue b/src/client/components/ui/textarea.vue index a42813ee64..fba9fc9d78 100644 --- a/src/client/components/ui/textarea.vue +++ b/src/client/components/ui/textarea.vue @@ -14,7 +14,7 @@ > -
+
@@ -163,13 +163,11 @@ export default Vue.extend({ > .save { margin: 6px 0 0 0; - font-size: 13px; + font-size: 0.8em; } > .desc { margin: 6px 0 0 0; - font-size: 13px; - opacity: 0.7; &:empty { display: none; diff --git a/src/client/pages/my-settings/word-mute.vue b/src/client/pages/my-settings/word-mute.vue index 6b2a372f0b..540a819bc0 100644 --- a/src/client/pages/my-settings/word-mute.vue +++ b/src/client/pages/my-settings/word-mute.vue @@ -13,10 +13,11 @@
{{ $t('_wordMute.hardDescription') }} - + {{ $t('_wordMute.muteWords') }} +
{{ $t('_wordMute.mutedNotesCount', { count: hardWordMutedNotesCount }) }}