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

compose: Change styling of upload progress bar. 

Related to #9095.
This commit is contained in:
Cynthia Lin 2018-04-10 14:36:07 -07:00 committed by Tim Abbott
parent 983deff5da
commit 7cbc9f40bf
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/upload.js
View File

@ -32,8 +32,8 @@ var upload_opts = upload.options({ mode: "compose" });
assert(handler);
};
$("#compose-error-msg").html('');
var test_html = '<div class="progress progress-striped active">' +
'<div class="bar" id="compose-upload-bar" style="width: 00%;"></div>' +
var test_html = '<div class="progress active">' +
'<div class="bar" id="compose-upload-bar" style="width: 0"></div>' +
'</div>';
$("#compose-send-status").append = function (html) {
assert.equal(html, test_html);

4
static/js/upload.js
View File

@ -71,8 +71,8 @@ exports.options = function (config) {
send_status.addClass("alert-info").show();
send_status_close.one('click', compose.abort_xhr);
error_msg.html($("<p>").text(i18n.t("Uploading…")));
send_status.append('<div class="progress progress-striped active">' +
'<div class="bar" id="' + upload_bar + '" style="width: 00%;"></div>' +
send_status.append('<div class="progress active">' +
'<div class="bar" id="' + upload_bar + '" style="width: 0"></div>' +
'</div>');
should_hide_upload_status = false;
};

5
static/styles/compose.css
View File

@ -245,6 +245,11 @@ div[id^="message-edit-send-status"],
display: none;
}
#compose-send-status .progress {
height: 10px;
margin-bottom: 10px;
}
#nonexistent_stream_reply_error {
padding: 8px 14px 8px 14px;
margin-bottom: 8px;

2
templates/zerver/compose.html
View File

@ -44,7 +44,7 @@
<div class="message_comp compose-content">
<div class="alert" id="compose-send-status">
<span class="compose-send-status-close">&times;</span>
<span id="compose-error-msg"></span>
<p id="compose-error-msg"></p>
</div>
<div id="compose_invite_users" class="alert home-error-bar"></div>
<div id="compose-all-everyone" class="alert home-error-bar"></div>