From 689d8221e5f3a536837a2fd6f5b1a7eccdad88c5 Mon Sep 17 00:00:00 2001
From: Vishnu Ks <yo@vishnuks.com>
Date: Sat, 5 Jan 2019 13:07:41 +0530
Subject: [PATCH] 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.
---
 templates/zerver/emails/email.css                  | 4 ++--
 templates/zerver/emails/missed_message.source.html | 2 +-
 version.py                                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/zerver/emails/email.css b/templates/zerver/emails/email.css
index 0f70b62084..60aec92bf2 100644
--- a/templates/zerver/emails/email.css
+++ b/templates/zerver/emails/email.css
@@ -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;
 }
diff --git a/templates/zerver/emails/missed_message.source.html b/templates/zerver/emails/missed_message.source.html
index 67d12999c4..af6e9058c4 100644
--- a/templates/zerver/emails/missed_message.source.html
+++ b/templates/zerver/emails/missed_message.source.html
@@ -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'>
diff --git a/version.py b/version.py
index 4240c94e81..44120e2f7b 100644
--- a/version.py
+++ b/version.py
@@ -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'