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

Restyle unread markers 

(imported from commit 70a363cb50eebdd0bd2f11ab56074e46301117b3)
This commit is contained in:
Allen Rabinovich 2014-02-18 09:05:27 -07:00
parent 56f1c023ab
commit cff698d210
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
static/styles/zulip.css
View File

@ -731,15 +731,6 @@ td.pointer {
transition: background-color 2.7s ease-in, color 2.7s ease-in;
}
.unread .message_time {
-webkit-transition: background-color 2.7s ease-in, color 2.7s ease-in;
-moz-transition: background-color 2.7s ease-in, color 2.7s ease-in;
-o-transition: background-color 2.7s ease-in, color 2.7s ease-in;
transition: background-color 2.7s ease-in, color 2.7s ease-in;
background: #7cb26d;
color: #000;
}
.message_time.status-time {
line-height: 14px;
top: 10px;
@ -1092,35 +1083,47 @@ just a temporary hack.
position: relative;
}
.include-sender .unread_marker {
top: 26px;
}
.unread_marker {
display: block;
position: absolute;
width: 6px;
height: 6px;
background: #2b8213;
left: 4px;
top: 9px;
left: -9px;
opacity: 0;
z-index: 10;
display: none;
z-index: 1;
height: 100%;
-webkit-transition: opacity 0.3s ease-in;
-moz-transition: opacity 0.3s ease-in;
-o-transition: opacity 0.3s ease-in;
transition: opacity 0.3s ease-in;
border-top: 2px solid #ffffff;
}
.unread-marker-fill {
background: #2b8213;
width: 6px;
height: 100%;
}
.unread .unread_marker {
-webkit-transition: opacity 0.3s ease-in;
-moz-transition: opacity 0.3s ease-in;
-o-transition: opacity 0.3s ease-in;
transition: opacity 0.3s ease-in;
opacity: 1;
}
.unread_marker.slow_fade {
-webkit-transition: all 2.7s ease-in;
-moz-transition: all 2.7s ease-in;
-o-transition: all 2.7s ease-in;
transition: all 2.7s ease-in;
-webkit-transition: opacity 2.7s ease-in;
-moz-transition: opacity 2.7s ease-in;
-o-transition: opacity 2.7s ease-in;
transition: opacity 2.7s ease-in;
}
.unread_marker.fast_fade {
-webkit-transition: all 0.3s ease-in;
-moz-transition: all 0.3s ease-in;
-o-transition: all 0.3s ease-in;
transition: all 0.3s ease-in;
-webkit-transition: opacity 0.3s ease-in;
-moz-transition: opacity 0.3s ease-in;
-o-transition: opacity 0.3s ease-in;
transition: opacity 0.3s ease-in;
}
.selected_message .messagebox {

2
static/templates/message.handlebars
View File

@ -169,7 +169,7 @@
{{/include_recipient}}
<div zid="{{id}}" id="{{dom_id}}"
class="message_row{{^is_stream}} private-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}{{#include_footer}} last_message{{/include_footer}}{{#unread}} unread{{/unread}} {{#if local_id}}local{{/if}} selectable_row">
<div class="unread_marker"></div>
<div class="unread_marker"><div class="unread-marker-fill"></div></div>
<div class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}{{^is_stream}} private-message{{/is_stream}}">
<div class="messagebox-border">
<div class="messagebox-content">