Skip to content

Commit

Permalink
css: Move inline date separators from messagebox to message_row.
Browse files Browse the repository at this point in the history
Fixes border-related glitches introduced by commit
51c6c82 (zulip#10820).  Alternative
to zulip#11534.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
  • Loading branch information
andersk authored and Nikhil-Vats committed Mar 17, 2019
1 parent 20d55ed commit 5d2324d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion static/styles/night_mode.scss
Expand Up @@ -355,7 +355,7 @@ on a dark background, and don't change the dark labels dark either. */
text-shadow: none;
}

.mention .messagebox-content {
.mention .messagebox {
background-color: hsla(8, 78%, 43%, 0.15);
}

Expand Down
6 changes: 3 additions & 3 deletions static/styles/zulip.scss
Expand Up @@ -1038,6 +1038,7 @@ td.pointer {
}

.private-message .messagebox,
.private-message .date_row,
.message_header_private_message .message-header-contents {
background-color: hsla(192, 19%, 75%, 0.2);
box-shadow: inset 1px 1px 0px hsl(0, 0%, 88%);
Expand All @@ -1047,7 +1048,7 @@ td.pointer {
border-right: 1px solid hsl(0, 0%, 88%);
}

.mention .messagebox-content {
.mention .messagebox {
background-color: hsl(8, 94%, 94%);
}

Expand Down Expand Up @@ -2653,7 +2654,7 @@ div.topic_edit_spinner .loading_indicator_spinner {
.sub-unsub-message,
.date_row {
text-align: center;
margin-bottom: 10px;
padding-bottom: 10px;
}

.date_row .date-direction {
Expand All @@ -2673,7 +2674,6 @@ div.topic_edit_spinner .loading_indicator_spinner {
.sub-unsub-message span,
.date_row span {
display: block;
background: inherit;
padding: 4px;
overflow: hidden;
text-transform: uppercase;
Expand Down
6 changes: 3 additions & 3 deletions static/templates/single_message.handlebars
Expand Up @@ -2,11 +2,11 @@
class="message_row{{^msg/is_stream}} private-message{{/msg/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}{{#include_footer}} last_message{{/include_footer}}{{#msg.unread}} unread{{/msg.unread}} {{#if msg.locally_echoed}}local{{/if}} selectable_row"
role="listitem">
<div class="unread_marker"><div class="unread-marker-fill"></div></div>
{{#if want_date_divider}}
<div class="date_row no-select" style="box-shadow: inset 2px 0px 0px 0px {{#if msg/is_stream}}{{background_color}}{{else}}#444444{{/if}}, -1px 0px 0px 0px {{#if msg/is_stream}}{{background_color}}{{else}}#444444{{/if}};">{{{date_divider_html}}}</div>
{{/if}}
<div class="messagebox{{^msg/is_stream}} private-message{{/msg/is_stream}} {{#if next_is_same_sender}}next_is_same_sender{{/if}}"
style="box-shadow: inset 2px 0px 0px 0px {{#if msg/is_stream}}{{background_color}}{{else}}#444444{{/if}}, -1px 0px 0px 0px {{#if msg/is_stream}}{{background_color}}{{else}}#444444{{/if}};">
{{#if want_date_divider}}
<div class="date_row no-select">{{{date_divider_html}}}</div>
{{/if}}
<div class="messagebox-border">
<div class="messagebox-content">
<div class="message_top_line">
Expand Down

0 comments on commit 5d2324d

Please sign in to comment.