summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-05-28 15:30:26 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-05-28 15:30:26 +0900
commit48a17629bbf668b3dabda4a2e866dc7f97179aa0 (patch)
treed4bac2904116eb657ab11bae7f07e398c2c40db9
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
downloadsharkey-48a17629bbf668b3dabda4a2e866dc7f97179aa0.tar.gz
sharkey-48a17629bbf668b3dabda4a2e866dc7f97179aa0.tar.bz2
sharkey-48a17629bbf668b3dabda4a2e866dc7f97179aa0.zip
Fix
-rw-r--r--locales/ja.yml2
-rw-r--r--src/client/app/desktop/views/components/note-preview.vue2
-rw-r--r--src/client/app/desktop/views/components/notes.note.sub.vue8
-rw-r--r--src/client/app/mobile/views/components/note-preview.vue3
-rw-r--r--src/client/app/mobile/views/components/note.sub.vue14
5 files changed, 17 insertions, 12 deletions
diff --git a/locales/ja.yml b/locales/ja.yml
index d8bc94b293..8fc82d1680 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -379,6 +379,8 @@ desktop/views/components/notes.note.vue:
renote: "Renote"
add-reaction: "リアクション"
detail: "詳細"
+ private: "この投稿は非公開です"
+ deleted: "この投稿は削除されました"
desktop/views/components/notes.vue:
error: "読み込みに失敗しました。"
diff --git a/src/client/app/desktop/views/components/note-preview.vue b/src/client/app/desktop/views/components/note-preview.vue
index a25eedb8f7..26c8a7d25c 100644
--- a/src/client/app/desktop/views/components/note-preview.vue
+++ b/src/client/app/desktop/views/components/note-preview.vue
@@ -49,7 +49,7 @@ root(isDark)
> .main
float left
- width calc(100% - 68px)
+ width calc(100% - 60px)
> header
display flex
diff --git a/src/client/app/desktop/views/components/notes.note.sub.vue b/src/client/app/desktop/views/components/notes.note.sub.vue
index 467b503bd9..ca8aaeede0 100644
--- a/src/client/app/desktop/views/components/notes.note.sub.vue
+++ b/src/client/app/desktop/views/components/notes.note.sub.vue
@@ -57,14 +57,14 @@ root(isDark)
> .avatar
display block
float left
- margin 0 14px 0 0
- width 52px
- height 52px
+ margin 0 12px 0 0
+ width 48px
+ height 48px
border-radius 8px
> .main
float left
- width calc(100% - 66px)
+ width calc(100% - 60px)
> header
display flex
diff --git a/src/client/app/mobile/views/components/note-preview.vue b/src/client/app/mobile/views/components/note-preview.vue
index fc7520bac7..c3e57d3381 100644
--- a/src/client/app/mobile/views/components/note-preview.vue
+++ b/src/client/app/mobile/views/components/note-preview.vue
@@ -63,6 +63,9 @@ root(isDark)
float left
width calc(100% - 60px)
+ @media (max-width 500px)
+ width calc(100% - 54px)
+
> header
display flex
align-items baseline
diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue
index 18d41cc7eb..9b9dd9e667 100644
--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@@ -62,21 +62,21 @@ root(isDark)
display block
float left
margin 0 10px 0 0
- width 44px
- height 44px
+ width 42px
+ height 42px
border-radius 8px
@media (min-width 500px)
- margin-right 16px
- width 52px
- height 52px
+ margin-right 14px
+ width 50px
+ height 50px
> .main
float left
- width calc(100% - 54px)
+ width calc(100% - 52px)
@media (min-width 500px)
- width calc(100% - 68px)
+ width calc(100% - 64px)
> header
display flex