graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 18:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1875 from tamaina/master

Browse source 
Improve Messaging
This commit is contained in:
syuilo 2018-07-09 21:24:59 +09:00 committed by GitHub
commit fadc80166b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/client/app/common/views/components/messaging-room.message.vue
View file

@ -3,7 +3,6 @@
<mk-avatar class="avatar" :user="message.user" target="_blank"/> <mk-avatar class="avatar" :user="message.user" target="_blank"/>
<div class="content"> <div class="content">
<div class="balloon" :data-no-text="message.text == null"> <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%"> <button class="delete-button" v-if="isMe" title="%i18n:common.delete%">
<img src="/assets/desktop/messaging/delete.png" alt="Delete"/> <img src="/assets/desktop/messaging/delete.png" alt="Delete"/>
</button> </button>
@ -23,6 +22,7 @@
<div></div> <div></div>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/>
<footer> <footer>
<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
<mk-time :time="message.createdAt"/> <mk-time :time="message.createdAt"/>
<template v-if="message.is_edited">%fa:pencil-alt%</template> <template v-if="message.is_edited">%fa:pencil-alt%</template>
</footer> </footer>
@ -120,17 +120,6 @@ root(isDark)
height 16px height 16px
cursor pointer 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 > .content
> .is-deleted > .is-deleted
@ -186,11 +175,14 @@ root(isDark)
margin 8px 0 margin 8px 0
> footer > footer
display block display flex
margin 2px 0 0 0 margin 2px 0 0 0
font-size 10px font-size 11px
color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4) color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4)
> .read
margin 0 8px 0 0
> [data-fa] > [data-fa]
margin-left 4px margin-left 4px
@ -222,7 +214,7 @@ root(isDark)
color #fff color #fff
> footer > footer
text-align left justify-content left
&[data-is-me] &[data-is-me]
> .avatar > .avatar
@ -256,7 +248,7 @@ root(isDark)
color #fff !important color #fff !important
> footer > footer
text-align right justify-content right
&[data-is-deleted] &[data-is-deleted]
> .baloon > .baloon

7
src/client/app/common/views/components/messaging-room.vue
View file

@ -255,7 +255,8 @@ root(isDark)
width 100% width 100%
max-width 600px max-width 600px
margin 0 auto margin 0 auto
flex 1 flex 1 1 0
overflow-y auto
> .init > .init
width 100% width 100%
@ -341,10 +342,6 @@ root(isDark)
background isDark ? #191b22 : #fff background isDark ? #191b22 : #fff
> footer > footer
position -webkit-sticky
position sticky
z-index 2
bottom 0
width 100% width 100%
max-width 600px max-width 600px
margin 0 auto margin 0 auto