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

CSS: Change color of PMs from yellow to blue-grey.

This commit is contained in:
Rishi Gupta 2017-04-20 19:58:18 -07:00 committed by Tim Abbott
parent d415d4cf11
commit 0ce04556bf
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
static/styles/reactions.css
View File

@ -15,13 +15,16 @@
}
.private-message .message_reactions .message_reaction {
/* Use the PM color background, since white-on-yellow looks bad. */
background-color: #feffe0;
background-color: #f0f4f5;
}
.message_reactions .reacted {
/* Needs to be important to override the .private-message one */
background-color: #eef7fa !important;
.message_reactions .message_reaction.reacted {
background-color: #eef7fa;
}
.private-message .message_reactions .message_reaction.reacted {
background-color: #e4f2f7;
border-color: #96c3d0;
}
.message_reaction .emoji {

4
static/styles/zulip.css
View File

@ -615,7 +615,7 @@ td.pointer {
}
.private-message .alert-copied {
background-color: #feffe0;
background-color: #f0f4f5;
}
.include-sender .alert-copied {
@ -988,7 +988,7 @@ td.pointer {
.private-message .messagebox,
.message_header_private_message .message-header-contents {
background-color: #feffe0;
background-color: #f0f4f5;
}
.floating_recipient .message-header-contents {

4
templates/zerver/emails/digest.html
View File

@ -11,9 +11,9 @@ Hello {{ name }},
<p>You have some missed private messages. Here are some of them:</p>
<div id='private-messages' style="width: 600px;font-size: 12px;font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;overflow-y: scroll;">
{% for recipient_block in unread_pms %}
<div class='recipient_block' style="background-color: #feffe0;border: 1px solid black;margin-bottom: 4px;">
<div class='recipient_block' style="background-color: #f0f4f5;border: 1px solid black;margin-bottom: 4px;">
<div class='recipient_header' style="color: #ffffff;background-color: #444444;border-bottom: 1px solid black;font-weight: bold;padding: 2px;">{{ recipient_block.header.html|safe }}</div>
<div class='message_content' style="background-color: #feffe0;margin-left: 1px;margin-right: 2px;">
<div class='message_content' style="background-color: #f0f4f5;margin-left: 1px;margin-right: 2px;">
{% for sender_block in recipient_block.senders %}
{% if sender_block.sender %} <div class="message_sender" style="font-weight: bold;padding-top: 1px;">{{ sender_block.sender }}</div>{% endif %}
{% for message_block in sender_block.content %}

4
templates/zerver/emails/missed_message.html
View File

@ -10,9 +10,9 @@ Hello {{ name }},
<div id='messages' style="width: 600px;font-size: 12px;font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;overflow-y: scroll;">
{% for recipient_block in messages %}
<div class='recipient_block' style="{% if not recipient_block.header.stream_message %}background-color: #feffe0;{% endif %}border: 1px solid black;margin-bottom: 4px;">
<div class='recipient_block' style="{% if not recipient_block.header.stream_message %}background-color: #f0f4f5;{% endif %}border: 1px solid black;margin-bottom: 4px;">
<div class='recipient_header' style="{% if recipient_block.header.stream_message %}background-color: #9ecaff;{% else %}color: #ffffff;background-color: #444444;{% endif %}border-bottom: 1px solid black;font-weight: bold;padding: 2px;">{{ recipient_block.header.html|safe }}</div>
<div class='message_content' style="{% if not recipient_block.header.stream_message %}background-color: #feffe0;{% endif %}margin-left: 1px;margin-right: 2px;">
<div class='message_content' style="{% if not recipient_block.header.stream_message %}background-color: #f0f4f5;{% endif %}margin-left: 1px;margin-right: 2px;">
{% for sender_block in recipient_block.senders %}
{% if sender_block.sender %} <div class="message_sender" style="font-weight: bold;padding-top: 1px;">{{ sender_block.sender }}</div>{% endif %}
{% for message_block in sender_block.content %}