From dad8fff12deccc49be001ca90003f9a0a260c58d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 18 May 2018 14:41:44 +0900 Subject: [PATCH] Fix ui --- locales/en.yml | 3 +++ locales/ja.yml | 4 ++++ src/client/app/desktop/views/components/note-preview.vue | 5 ++++- src/client/app/desktop/views/components/notes.note.vue | 1 + src/client/app/mobile/views/components/note-preview.vue | 3 ++- src/client/app/mobile/views/components/note.vue | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 5580ead2d3..9f2a0be3ae 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -1,4 +1,7 @@ --- +meta: + lang: "English" + divider: " " common: misskey: "Share everything with others using Misskey." time: diff --git a/locales/ja.yml b/locales/ja.yml index 40527adcf3..d71251d203 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -1,3 +1,7 @@ +meta: + lang: "日本語" + divider: "" + common: misskey: "Misskeyで皆と共有しよう。" diff --git a/src/client/app/desktop/views/components/note-preview.vue b/src/client/app/desktop/views/components/note-preview.vue index 2b4eff8e2f..302c5e803f 100644 --- a/src/client/app/desktop/views/components/note-preview.vue +++ b/src/client/app/desktop/views/components/note-preview.vue @@ -59,17 +59,20 @@ root(isDark) > .name margin 0 .5em 0 0 padding 0 + overflow hidden color isDark ? #fff : #607073 font-size 1em font-weight bold text-decoration none - white-space normal + text-overflow ellipsis &:hover text-decoration underline > .username margin 0 .5em 0 0 + overflow hidden + text-overflow ellipsis color isDark ? #606984 : #d1d8da > .time diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 44121684ee..8660a5f899 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -350,6 +350,7 @@ root(isDark) align-items center padding 16px 32px line-height 28px + white-space pre color #9dbb00 background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) diff --git a/src/client/app/mobile/views/components/note-preview.vue b/src/client/app/mobile/views/components/note-preview.vue index ec11f23315..b3ab088ffe 100644 --- a/src/client/app/mobile/views/components/note-preview.vue +++ b/src/client/app/mobile/views/components/note-preview.vue @@ -69,8 +69,9 @@ root(isDark) text-decoration underline > .username - text-align left margin 0 .5em 0 0 + overflow hidden + text-overflow ellipsis color isDark ? #606984 : #d1d8da > .time diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index f5428b80cd..77a766f327 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -268,6 +268,7 @@ root(isDark) align-items center padding 8px 16px line-height 28px + white-space pre color #9dbb00 background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%)