diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-07-20 21:47:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 21:47:35 +0900 |
| commit | b8e948b009b287caa37fefeb28550e874b59688d (patch) | |
| tree | bca4095ce1f8d558f5bfc27adaa694294f8a8313 /src | |
| parent | Update ISSUE_TEMPLATE (diff) | |
| parent | Fix #1803 (diff) | |
| download | sharkey-b8e948b009b287caa37fefeb28550e874b59688d.tar.gz sharkey-b8e948b009b287caa37fefeb28550e874b59688d.tar.bz2 sharkey-b8e948b009b287caa37fefeb28550e874b59688d.zip | |
Merge pull request #1936 from syuilo/patch-1803
Fix #1803
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/messaging-room.message.vue | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index 7da36d0e6d..65231aed17 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -3,7 +3,6 @@ <mk-avatar class="avatar" :user="message.user" target="_blank"/> <div class="content"> <div class="balloon" :data-no-text="message.text == null"> - <p class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p> <!-- <button class="delete-button" v-if="isMe" title="%i18n:common.delete%"> <img src="/assets/desktop/messaging/delete.png" alt="Delete"/> </button> --> @@ -23,6 +22,7 @@ <div></div> <mk-url-preview v-for="url in urls" :url="url" :key="url"/> <footer> + <span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span> <mk-time :time="message.createdAt"/> <template v-if="message.is_edited">%fa:pencil-alt%</template> </footer> @@ -120,17 +120,6 @@ root(isDark) height 16px cursor pointer - > .read - user-select none - display block - position absolute - z-index 1 - bottom -4px - left -12px - margin 0 - color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5) - font-size 11px - > .content > .is-deleted @@ -258,6 +247,12 @@ root(isDark) > footer text-align right + > .read + user-select none + margin 0 4px 0 0 + color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5) + font-size 11px + &[data-is-deleted] > .baloon opacity 0.5 |