diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-07-08 23:45:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-08 23:45:16 +0900 |
| commit | 7b3f52505e2566fbf0b1bd824d6ea71c15cacaff (patch) | |
| tree | 30506038b8dfc164931ebe4e66904a271bca26e6 /src/client | |
| parent | Update messaging-room.vue (diff) | |
| download | sharkey-7b3f52505e2566fbf0b1bd824d6ea71c15cacaff.tar.gz sharkey-7b3f52505e2566fbf0b1bd824d6ea71c15cacaff.tar.bz2 sharkey-7b3f52505e2566fbf0b1bd824d6ea71c15cacaff.zip | |
Update messaging-room.message.vue
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/messaging-room.message.vue | 24 |
1 files changed, 8 insertions, 16 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 f33173da6f..1f18639929 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%</p> <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 @@ -186,11 +175,14 @@ root(isDark) margin 8px 0 > footer - display block + display flex margin 2px 0 0 0 - font-size 10px + font-size 11px color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4) + > .read + margin 0 8px 0 0 + > [data-fa] margin-left 4px @@ -222,7 +214,7 @@ root(isDark) color #fff > footer - text-align left + justify-content left &[data-is-me] > .avatar @@ -256,7 +248,7 @@ root(isDark) color #fff !important > footer - text-align right + justify-content right &[data-is-deleted] > .baloon |