diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 6aac41c7d8..60378df1b2 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1865,8 +1865,8 @@ pages:
font: "フォント"
fontSerif: "セリフ"
fontSansSerif: "サンセリフ"
- set-eye-catchig-image: "アイキャッチ画像を設定"
- remove-eye-catchig-image: "アイキャッチ画像を削除"
+ set-eye-catching-image: "アイキャッチ画像を設定"
+ remove-eye-catching-image: "アイキャッチ画像を削除"
choose-block: "ブロックを追加"
select-type: "種類を選択"
enter-variable-name: "変数名を決めてください"
diff --git a/src/client/app/app.styl b/src/client/app/app.styl
index a98ece7a51..6389aa0a87 100644
--- a/src/client/app/app.styl
+++ b/src/client/app/app.styl
@@ -34,7 +34,7 @@ body
.peg
display block
position absolute
- right 0px
+ right 0
width 100px
height 100%
box-shadow 0 0 10px var(--primary), 0 0 5px var(--primary)
diff --git a/src/client/app/auth/views/index.vue b/src/client/app/auth/views/index.vue
index 9bf2acba72..ad9b1e4e35 100644
--- a/src/client/app/auth/views/index.vue
+++ b/src/client/app/auth/views/index.vue
@@ -98,7 +98,7 @@ export default Vue.extend({
margin 0 auto
text-align center
background #fff
- box-shadow 0px 4px 16px rgba(#000, 0.2)
+ box-shadow 0 4px 16px rgba(#000, 0.2)
> .fetching
margin 0
diff --git a/src/client/app/common/hotkey.ts b/src/client/app/common/hotkey.ts
index b2afd57ae3..a53d3f479e 100644
--- a/src/client/app/common/hotkey.ts
+++ b/src/client/app/common/hotkey.ts
@@ -52,7 +52,7 @@ function match(e: KeyboardEvent, patterns: action['patterns']): boolean {
pattern.ctrl == e.ctrlKey &&
pattern.shift == e.shiftKey &&
pattern.alt == e.altKey &&
- e.metaKey == false
+ !e.metaKey
);
}
diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts
index c5f1898942..8fd7888628 100644
--- a/src/client/app/common/scripts/should-mute-note.ts
+++ b/src/client/app/common/scripts/should-mute-note.ts
@@ -11,9 +11,9 @@ export default function(me, settings, note) {
return (
(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
- (settings.showMyRenotes === false && isMyNote && isPureRenote) ||
- (settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
- (settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
+ (!settings.showMyRenotes && isMyNote && isPureRenote) ||
+ (!settings.showRenotedMyNotes && isPureRenote && note.renote.userId == me.id) ||
+ (!settings.showLocalRenotes && isPureRenote && note.renote.user.host == null) ||
(!isMyNote && includesMutedWords(note.text))
);
}
diff --git a/src/client/app/common/views/components/analog-clock.vue b/src/client/app/common/views/components/analog-clock.vue
index 4ba578a1a4..5eb7ffd153 100644
--- a/src/client/app/common/views/components/analog-clock.vue
+++ b/src/client/app/common/views/components/analog-clock.vue
@@ -80,7 +80,7 @@ export default Vue.extend({
ms(): number {
return this.now.getMilliseconds() * this.smooth;
- }
+ },
s(): number {
return this.now.getSeconds();
},
diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue
index 957fd389d9..f884a599d7 100644
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -202,7 +202,7 @@ export default Vue.extend({
left 0
z-index 1
width 100%
- box-shadow 0 0px 2px rgba(#000, 0.2)
+ box-shadow 0 0 2px rgba(#000, 0.2)
> .form
background rgba(0, 0, 0, 0.02)
diff --git a/src/client/app/common/views/components/page-editor/page-editor.vue b/src/client/app/common/views/components/page-editor/page-editor.vue
index d70049121d..baccda8a43 100644
--- a/src/client/app/common/views/components/page-editor/page-editor.vue
+++ b/src/client/app/common/views/components/page-editor/page-editor.vue
@@ -36,10 +36,10 @@
-
{{ $t('set-eye-catchig-image') }}
+
{{ $t('set-eye-catching-image') }}
![]()
-
{{ $t('remove-eye-catchig-image') }}
+
{{ $t('remove-eye-catching-image') }}