wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-07 01:09:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated error styling

Browse Source
This commit is contained in:
Wyatt Johnson
2018-04-16 10:47:09 -06:00
parent 276cb03953
commit f23f962adb
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-profile-data/server/views/download.ejs
+5 -3
View File
@@ -16,7 +16,7 @@
<li><%= t('download_landing.information_included.body') %></li>
<li><%= t('download_landing.information_included.asset_url') %></li>
</ul>
<div class="error-console"></div>
<div class="error-console"><span></span></div>
<form id="download-form" method="post" action="<%= BASE_PATH %>api/v1/account/download">
<button type="submit"><%= t('download_landing.confirm') %></button>
</form>
@@ -28,9 +28,11 @@
function showError(error) {
try {
let err = JSON.parse(error);
$('.error-console').text(err.message).fadeIn();
$('.error-console span').text(err.message);
$('.error-console').fadeIn();
} catch (err) {
$('.error-console').text(error).fadeIn();
$('.error-console span').text(error);
$('.error-console').fadeIn();
}
}
public/css/admin.css
+12 -4
View File
@@ -3,6 +3,7 @@ body, #root {
height: 100%;
margin: 0;
background: #fff;
color: #3B4A53;
}
.container {
@@ -83,11 +84,18 @@ button[type="submit"] {
display: none;
margin-top: 10px;
border-radius: 2px;
background-color: pink;
color: red;
border: 1px solid red;
background-color: rgba(242, 101, 99, 0.1);
border: 1px solid #F26563;
padding: 10px;
font-size: 24px;
}
.error-console span:before {
font-family: 'Material Icons';
content: '\E000';
color: #000;
display: inline-block;
vertical-align: sub;
width: 1.4em;
}
ul.check_list {
views/account/email/confirm.ejs
+5 -3
View File
@@ -9,7 +9,7 @@
<section class="container">
<h1><%= t('confirm_email.email_confirmation') %></h1>
<p><%= t('confirm_email.click_to_confirm') %></p>
<div class="error-console"></div>
<div class="error-console"><span></span></div>
<form id="verify-email-form">
<button type="submit"><%= t('confirm_email.confirm') %></button>
</form>
@@ -21,9 +21,11 @@
function showError(error) {
try {
let err = JSON.parse(error);
$('.error-console').text(err.message).fadeIn();
$('.error-console span').text(err.message);
$('.error-console').fadeIn();
} catch (err) {
$('.error-console').text(error).fadeIn();
$('.error-console span').text(error);
$('.error-console').fadeIn();
}
}
views/account/password/reset.ejs
+6 -4
View File
@@ -9,12 +9,12 @@
<section class="container">
<h1><%= t('password_reset.set_new_password') %></h1>
<p><%= t('password_reset.change_password_help') %></p>
<div class="error-console"></div>
<div class="error-console"><span></span></div>
<form id="reset-password-form">
<label for="password">
<%= t('password_reset.new_password') %>
<input type="password" name="password" placeholder="<%= t('password_reset.new_password') %>" />
<p><small><%= t('password_reset.new_password_help') %></small></p>
<small><%= t('password_reset.new_password_help') %></small>
</label>
<label for="confirm-password">
<%= t('password_reset.confirm_new_password') %>
@@ -30,9 +30,11 @@
function showError(error) {
try {
let err = JSON.parse(error);
$('.error-console').text(err.message).fadeIn();
$('.error-console span').text(err.message);
$('.error-console').fadeIn();
} catch (err) {
$('.error-console').text(error).fadeIn();
$('.error-console span').text(error);
$('.error-console').fadeIn();
}
}