paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 21:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

alerts: Polish .alert-box .alert styling.

Browse Source 
This polishes the styling on the alerts inside of the .alert-box to
have more appropriate colors, margins, and padding.
This commit is contained in:
Brock Whittaker
2017-04-05 14:33:14 -07:00
committed by Tim Abbott
parent ec90f0c342
commit c7cb20d873
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/activity.js
View File

@@ -387,9 +387,9 @@ function focus_ping(want_redraw) {
// Update Zephyr mirror activity warning // Update Zephyr mirror activity warning
if (data.zephyr_mirror_active === false) { if (data.zephyr_mirror_active === false) {
$('#zephyr-mirror-error').show(); $('#zephyr-mirror-error').addClass("show");
} else { } else {
$('#zephyr-mirror-error').hide(); $('#zephyr-mirror-error').removeClass("show");
} }
exports.new_user_input = false; exports.new_user_input = false;

6
static/js/click_handlers.js
View File

@@ -437,7 +437,7 @@ $(function () {
// WEBATHENA // WEBATHENA
$('#right-sidebar, #top_navbar').on('click', '.webathena_login', function (e) { $('#right-sidebar, #top_navbar').on('click', '.webathena_login', function (e) {
$("#zephyr-mirror-error").hide(); $("#zephyr-mirror-error").removeClass("show");
var principal = ["zephyr", "zephyr"]; var principal = ["zephyr", "zephyr"];
WinChan.open({ WinChan.open({
url: "https://webathena.mit.edu/#!request_ticket_v1", url: "https://webathena.mit.edu/#!request_ticket_v1",
@@ -460,10 +460,10 @@ $(function () {
url: "/accounts/webathena_kerberos_login/", url: "/accounts/webathena_kerberos_login/",
data: {cred: JSON.stringify(r.session)}, data: {cred: JSON.stringify(r.session)},
success: function () { success: function () {
$("#zephyr-mirror-error").hide(); $("#zephyr-mirror-error").removeClass("show");
}, },
error: function () { error: function () {
$("#zephyr-mirror-error").show(); $("#zephyr-mirror-error").addClass("show");
}, },
}); });
}); });

30
static/styles/alerts.css
View File

@@ -38,9 +38,16 @@
.alert-box .alert { .alert-box .alert {
font-size: 1rem; font-size: 1rem;
box-shadow: 0px 0px 30px rgba(220, 78, 78, 0.3);
border-radius: 0px; border-radius: 0px;
border: none; border: none;
background-color: #f9f0c1;
box-shadow: 0px 0px 30px rgba(214, 192, 115, 0.35);
}
.alert-box .alert-error {
box-shadow: 0px 0px 30px rgba(220, 78, 78, 0.3);
} }
.alert-box .alert a { .alert-box .alert a {
@@ -59,33 +66,40 @@
color: #89dcff; color: #89dcff;
} }
.alert-box .alert.alert-error::before { .alert-box .alert::before {
position: absolute; position: absolute;
top: 15px; top: 10px;
left: 10px; left: 10px;
font-family: "FontAwesome"; font-family: "FontAwesome";
font-size: 1.5em; font-size: 1.3em;
content: "\f071"; content: "\f071";
color: #c09853;
}
.alert-box .alert.alert-error::before {
color: #fff; color: #fff;
} }
.alert-box .alert.alert-error { .alert-box .alert {
position: relative; position: relative;
/* gives room for the error icon. */ /* gives room for the error icon. */
padding-left: 50px; padding-left: 50px;
padding-top: 15px; padding-top: 10px;
text-shadow: none;
}
.alert-box .alert.alert-error {
background-color: #bd6767; background-color: #bd6767;
color: #fff; color: #fff;
text-shadow: none;
} }
.alert-box .alert .exit { .alert-box .alert .exit {
position: absolute; position: absolute;
top: 15px; top: 10px;
right: 0px; right: 0px;
font-size: 2.5em; font-size: 2.5em;