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

emails: Fix the if condition logic in missed_message.html. 

Refactoring in 4e1c058 was not correct since recipient_block
and message_content checked for if not condition while
recipient_header checked for if.

The naming of classes in 6077a33 was also not correct
semantically.
This commit is contained in:
Vishnu Ks 2019-01-05 13:07:41 +05:30 committed by Tim Abbott
parent 21f4aeff4f
commit 689d8221e5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zerver/emails/email.css
View File

@ -243,7 +243,6 @@ a.button:hover {
}
.recipient_block_with_messages {
background-color: #f0f4f5;
border: 1px solid black;
margin-bottom: 4px;
}
@ -256,12 +255,12 @@ a.button:hover {
}
.message_content_with_messages {
background-color: #f0f4f5;
margin-left: 1px;
margin-right: 2px;
}
.recipient_block_without_messages {
background-color: #f0f4f5;
border: 1px solid black;
margin-bottom: 4px;
}
@ -275,6 +274,7 @@ a.button:hover {
}
.message_content_without_messages {
background-color: #f0f4f5;
margin-left: 1px;
margin-right: 2px;
}

2
templates/zerver/emails/missed_message.source.html
View File

@ -20,7 +20,7 @@
{% if show_message_content %}
<div class='messages'>
{% for recipient_block in messages %}
{% if not recipient_block.header.stream_message %}
{% if recipient_block.header.stream_message %}
<div class='recipient_block_with_messages'>
<div class='recipient_header_with_messages'>{{ recipient_block.header.html|safe }}</div>
<div class='message_content_with_messages'>

2
version.py
View File

@ -11,4 +11,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2018/11/07/zulip-1-9-relea
# Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump.
PROVISION_VERSION = '26.20'
PROVISION_VERSION = '26.21'