paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better date separator rendering

Browse Source 
Split up long string

(imported from commit 51bab3cbb2d77f0e130d6bb0d486f2d7feba0909)
This commit is contained in:
Allen Rabinovich
2013-09-10 09:40:31 -07:00
parent 8d67fc2775
commit 3560ecf429
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/timerender.js
View File

@@ -66,7 +66,9 @@ function maybe_add_update_list_entry (needs_update, id, time, time_above) {
function render_date_span(elem, time_str, time_above_str) { function render_date_span(elem, time_str, time_above_str) {
elem.text(""); elem.text("");
if (time_above_str !== undefined) { if (time_above_str !== undefined) {
return elem.append("▲ " + time_above_str + " ▲").append($("<hr />")).append("▼ " + time_str + " ▼"); return elem.append('<i class="date-direction icon-vector-caret-up"></i>' +
time_above_str).append($('<hr class="date-line">')).append('<i class="date-direction icon-vector-caret-down"></i>'
+ time_str);
} else { } else {
return elem.append(time_str); return elem.append(time_str);
} }

23
static/styles/zulip.css
View File

@@ -2360,6 +2360,20 @@ li.expanded_subject {
padding-bottom: 10px; /* same as .bookend */ padding-bottom: 10px; /* same as .bookend */
} }
.date_row .date-direction {
display: inline-block;
padding-right: 5px;
}
.date_row .date-line {
display: inline-block;
vertical-align: middle;
width: 33%;
border-top: 1px solid #ccc;
border-bottom:1px solid #fff;
margin: 0px 5px 0px 5px;
}
.date_row span { .date_row span {
display: block; display: block;
background: inherit; background: inherit;
@@ -2393,15 +2407,6 @@ li.expanded_subject {
margin-right: -50%; margin-right: -50%;
} }
.date_row hr {
display: inline-block;
vertical-align: middle;
width: 33%;
border-top: 1px solid #ccc;
border-bottom:1px solid #fff;
margin: 0;
}
#restore-draft { #restore-draft {
float: left; float: left;
display: none; display: none;