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

Fix issues with message editing and status message layouts 

(imported from commit 3ec5c6ccf6c20a6c102075887b6ff36afc613bdd)
This commit is contained in:
Allen Rabinovich 2014-01-31 15:52:18 -07:00
parent 25331d8bb2
commit 78a3da7fbe
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/ui.js
View File

@ -125,6 +125,7 @@ exports.replace_emoji_with_text = function (element) {
}; };
function copy_handler(e) { function copy_handler(e) {
console.log(e);
var selection = window.getSelection(); var selection = window.getSelection();
var i, range, ranges = [], startc, endc, initial_end_tr, start_id, end_id, row, message; var i, range, ranges = [], startc, endc, initial_end_tr, start_id, end_id, row, message;
var start_data, end_data; var start_data, end_data;

36
static/styles/zulip.css
View File

@ -715,8 +715,6 @@ td.pointer {
text-align: left; text-align: left;
} }
.message_time { .message_time {
display: inline-block; display: inline-block;
font-weight: normal; font-weight: normal;
@ -732,11 +730,15 @@ td.pointer {
text-align: right; text-align: right;
} }
.message_time.status-time {
line-height: 35px;
}
.message_controls { .message_controls {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 2px; top: 2px;
right: -78px; right: -50px;
} }
.include-sender .message_controls { .include-sender .message_controls {
@ -1128,16 +1130,22 @@ just a temporary hack.
} }
.sender-status { .sender-status {
display: block; display: inline-block;
margin-left: 35px; padding-bottom: 22px;
margin-top: -24px; vertical-align: top;
padding-bottom: 20px; height: 35px;
line-height: 35px;
font-size: 13px;
position: relative;
} }
.sender-status .sender_name { .sender-status .sender_name {
font-weight: bold; font-weight: bold;
position: static; position: static;
vertical-align: bottom; vertical-align: top;
line-height: 35px;
margin-right: 3px;
font-size: 13px;
} }
.sender_name_hovered .sender_name { .sender_name_hovered .sender_name {
@ -1227,7 +1235,7 @@ a.message_label_clickable:hover {
} }
.include-sender .messagebox-border { .include-sender .messagebox-border {
margin-top: 8px; padding-top: 6px;
} }
.include-sender .message_top_line { .include-sender .message_top_line {
@ -1392,7 +1400,7 @@ blockquote p {
} }
.messagebox-content { .messagebox-content {
padding: 1px 85px 1px 16px; padding: 1px 55px 1px 16px;
} }
.messagebox p { .messagebox p {
@ -2013,7 +2021,7 @@ input.recipient_box {
width: auto; width: auto;
float: none; float: none;
overflow: hidden; overflow: hidden;
border-right: 1px solid #e4e4e4; border-right: 1px solid #dadada;
height: 40px; height: 40px;
} }
@ -3152,6 +3160,7 @@ div.edit_bot {
.message_edit { .message_edit {
display: none; display: none;
margin-top: 5px; margin-top: 5px;
margin-left: 47px;
} }
/* Reduce some of the heavy padding from Bootstrap. */ /* Reduce some of the heavy padding from Bootstrap. */
@ -3159,9 +3168,12 @@ div.edit_bot {
width: auto; width: auto;
float: left; float: left;
font-size: 80%; font-size: 80%;
vertical-align: top;
padding-top: 0px;
margin-right: 10px;
} }
#message_edit_form .edit-controls { #message_edit_form .edit-controls {
margin-left: 28px; /* Match .message_content padding less 7px textarea padding and border */ margin-left: 35px; /* Match .message_content padding less 7px textarea padding and border */
margin-right: -7px; margin-right: -7px;
} }
#message_edit_form textarea { #message_edit_form textarea {

2
static/templates/message.handlebars
View File

@ -177,7 +177,7 @@
style="background-image: url('{{small_avatar_url}}');"/><span class="{{^status_message}}sender_name{{/status_message}}{{#status_message}}sender-status{{/status_message}}">{{#unless status_message}}{{sender_full_name}}{{else}}<span class="sender_name sender_info_hover">{{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}}{{sender_full_name}}{{else}}<span class="sender_name sender_info_hover">{{sender_full_name}}</span>{{{ status_message }}}{{/unless}}</span>
</span> </span>
{{/include_sender}} {{/include_sender}}
<span class="message_time {{#if local_id}}notvisible{{/if}}">{{timestr}}</span> <span class="message_time{{#if 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}})">EDITED</div> <div class="message_edit_notice" title="Edited ({{last_edit_timestr}})">EDITED</div>
{{/if_and}} {{/if_and}}