diff options
| author | Xeltica <7106976+Xeltica@users.noreply.github.com> | 2018-11-08 13:54:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-08 13:54:59 +0900 |
| commit | 6c951200239272493053103d2b2fbd44cb05d05c (patch) | |
| tree | 812e8a4d02be580ab8e1b67319a8edef1a42f604 /src | |
| parent | :art: (diff) | |
| download | sharkey-6c951200239272493053103d2b2fbd44cb05d05c.tar.gz sharkey-6c951200239272493053103d2b2fbd44cb05d05c.tar.bz2 sharkey-6c951200239272493053103d2b2fbd44cb05d05c.zip | |
via の表示を改善 (#3161)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/desktop/views/components/note-detail.vue | 7 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/note.vue | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 8238c4824c..ae9cee5d0b 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -60,6 +60,7 @@ </div> </div> <footer> + <span class="app" v-if="note.app">via <b>{{ note.app.name }}</b></span> <mk-reactions-viewer :note="p"/> <button class="replyButton" @click="reply" title=""> <template v-if="p.reply"><fa icon="reply-all"/></template> @@ -389,6 +390,12 @@ export default Vue.extend({ > footer font-size 1.2em + > .app + display block + font-size 0.8em + margin-left 0.5em + color var(--noteHeaderInfo) + > button margin 0 28px 0 0 padding 8px diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index 0ccf59bc81..f267ebad10 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -24,7 +24,7 @@ <article> <mk-avatar class="avatar" :user="appearNote.user"/> <div class="main"> - <mk-note-header class="header" :note="appearNote"/> + <mk-note-header class="header" :note="appearNote" :mini="mini"/> <div class="body"> <p v-if="appearNote.cw != null" class="cw"> <span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span> @@ -47,6 +47,7 @@ </div> </div> <footer> + <span class="app" v-if="appearNote.app && mini">via <b>{{ appearNote.app.name }}</b></span> <mk-reactions-viewer :note="appearNote" ref="reactionsViewer"/> <button class="replyButton" @click="reply()" title="%i18n:@reply%"> <template v-if="appearNote.reply"><fa icon="reply-all"/></template> @@ -318,6 +319,12 @@ export default Vue.extend({ border-radius 8px > footer + > .app + display block + margin-top 0.5em + margin-left 0.5em + color var(--noteHeaderInfo) + font-size 0.8em > button margin 0 28px 0 0 padding 0 8px |