Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix placement of EDITED in one line status messages. 

Fixes #836.
This commit is contained in:
Tomasz Kolek 2016-06-01 19:57:04 +02:00 committed by Tim Abbott
parent 15b2dd085e
commit c5b56c15de
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/styles/zulip.css
View File

@ -728,6 +728,10 @@ td.pointer {
width: auto; width: auto;
} }
.sender-status .message_edit_notice {
line-height: 18px;
}
.message_edit_notice { .message_edit_notice {
font-size: 10px; font-size: 10px;
color: #a1a1a1; color: #a1a1a1;

22
static/templates/single_message.handlebars
View File

@ -10,12 +10,28 @@
<span class="message_sender{{^status_message}} sender_info_hover{{/status_message}}"> <span class="message_sender{{^status_message}} sender_info_hover{{/status_message}}">
{{! See ../js/notifications.js for another user of avatar_url. }} {{! See ../js/notifications.js for another user of avatar_url. }}
<div class="inline_profile_picture{{#status_message}} sender_info_hover{{/status_message}}" <div class="inline_profile_picture{{#status_message}} sender_info_hover{{/status_message}}"
style="background-image: url('{{small_avatar_url}}');"/><span class="{{^status_message}}sender_name{{/status_message}}{{#status_message}}sender-status{{/status_message}}">{{#unless status_message}}{{msg/sender_full_name}}{{else}}<span class="sender_name{{#status_message}}-in-status{{/status_message}} sender_info_hover">{{msg/sender_full_name}}</span>{{{ status_message }}}{{/unless}}</span> style="background-image: url('{{small_avatar_url}}');"/>
<span class="{{^status_message}}sender_name{{/status_message}}{{#status_message}}sender-status{{/status_message}}">
{{#unless status_message}}
{{msg/sender_full_name}}
{{else}}
<span class="sender_name{{#status_message}}-in-status{{/status_message}} sender_info_hover">{{msg/sender_full_name}}</span>
{{{ status_message }}}
{{/unless}}
{{#if_and last_edit_timestr include_sender}}
{{#if status_message}}
<div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
{{/if}}
{{/if_and}}
</span>
</span> </span>
{{/include_sender}} {{/include_sender}}
<span class="message_time{{#if msg.local_id}} notvisible{{/if}}{{#if status_message}} status-time{{/if}}">{{timestr}}</span> <span class="message_time{{#if msg.local_id}} notvisible{{/if}}{{#if status_message}} status-time{{/if}}">{{timestr}}</span>
{{#if_and last_edit_timestr include_sender}} {{#if_and last_edit_timestr include_sender}}
<div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div> {{#unless status_message}}
<div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
{{/unless}}
{{/if_and}} {{/if_and}}
<div class="message_controls{{#status_message}} sender-status-controls{{/status_message}}"> <div class="message_controls{{#status_message}} sender-status-controls{{/status_message}}">
<div class="star"> <div class="star">
@ -33,7 +49,7 @@
<div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div> <div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div>
{{#if last_edit_timestr}} {{#if last_edit_timestr}}
{{#unless include_sender}} {{#unless include_sender}}
<div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div> <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">{{t "EDITED" }}</div>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
<div class="message_edit"> <div class="message_edit">