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

drafts: Remove left border from draft-box. 

This removes the left border extending the stream label from the
recipient bar in from the drafts in drafts modal.  Those borders are
important in the message feed for containing several messages, but
here we're only ever going to show individual drafts, and this change
avoids potential color clashes with the blue box surrounding the
recipient blocks.
This commit is contained in:
Vaibhav 2019-02-14 22:12:26 +05:30 committed by Tim Abbott
parent 2ca8ec371e
commit fb111d017f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/templates.js
View File

@ -646,8 +646,6 @@ run_test('draft_table_body', () => {
assert.equal(row_1.find(".stream_label").css("background"), "rgb(255, 0, 0)"); assert.equal(row_1.find(".stream_label").css("background"), "rgb(255, 0, 0)");
assert.equal(row_1.find(".stream_topic").text().trim(), "tests"); assert.equal(row_1.find(".stream_topic").text().trim(), "tests");
assert(!row_1.find(".message_row").hasClass("private-message")); assert(!row_1.find(".message_row").hasClass("private-message"));
assert.equal(row_1.find(".messagebox").css("box-shadow"),
"inset 2px 0px 0px 0px #FF0000, -1px 0px 0px 0px #FF0000");
assert.equal(row_1.find(".message_content").text().trim(), "Public draft"); assert.equal(row_1.find(".message_content").text().trim(), "Public draft");
var row_2 = $(html).find(".draft-row[data-draft-id='2']"); var row_2 = $(html).find(".draft-row[data-draft-id='2']");

7
static/styles/drafts.scss
View File

@ -88,11 +88,14 @@
.draft-row .draft-info-box { .draft-row .draft-info-box {
width: 100%; width: 100%;
border-bottom: 1px solid hsl(0, 0%, 88%); border: 1px solid hsl(0, 0%, 88%);
border-top: 1px solid hsl(0, 0%, 88%);
margin-bottom: 10px; margin-bottom: 10px;
} }
.draft-info-box .message_row {
border: 0;
}
.draft-info-box .messagebox { .draft-info-box .messagebox {
cursor: auto; cursor: auto;
} }

3
static/templates/draft.handlebars
View File

@ -28,8 +28,7 @@
</div> </div>
{{/if}} {{/if}}
<div class="message_row{{^is_stream}} private-message{{/is_stream}}" role="listitem"> <div class="message_row{{^is_stream}} private-message{{/is_stream}}" role="listitem">
<div class="messagebox" <div class="messagebox">
style="box-shadow: inset 2px 0px 0px 0px {{#if is_stream}}{{stream_color}}{{else}}#444444{{/if}}, -1px 0px 0px 0px {{#if is_stream}}{{stream_color}}{{else}}#444444{{/if}};">
<div class="messagebox-content"> <div class="messagebox-content">
<div class="message_top_line"> <div class="message_top_line">
<div class="draft_controls"> <div class="draft_controls">