Skip to content

Commit

Permalink
Merge pull request #1438 from jadu/purple-signin
Browse files Browse the repository at this point in the history
Improvements to sign-in screens following Connect integration
  • Loading branch information
jamesjacobs authored Aug 5, 2022
2 parents 81d87cc + 1e13279 commit f78a025
Show file tree
Hide file tree
Showing 5 changed files with 562 additions and 416 deletions.
8 changes: 4 additions & 4 deletions js/area/signin/signin.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SignInComponent.prototype.init = function () {

component.$alert = $('.alert');
component.successMessage = 'Signed in successfully';
component.signInFailMessage = 'Your username and/or password was incorrect';
component.signInFailMessage = '<i class="icon icon-exclamation-triangle"></i> Your username and/or password was incorrect';

component.hint = '<i class="signin__hint"></i>',
component.infoText = component.$info.text(),
Expand Down Expand Up @@ -106,7 +106,7 @@ SignInComponent.prototype.init = function () {
this.$html.find('[name="signin-submit"]').on('click', function(e) {
e.preventDefault();

var infoText = 'Enter your username and password';
var infoText = '<i class="icon icon-exclamation-triangle"></i> Enter your username and password';

if (!component.$usernameField.val() || !component.$passwordField.val()) {
component.$container
Expand All @@ -116,7 +116,7 @@ SignInComponent.prototype.init = function () {
});

if (component.$usernameField.val() && !component.$passwordField.val()) {
infoText = 'Enter your password';
infoText = '<i class="icon icon-exclamation-triangle"></i> Enter your password';

component.$passwordField.focus();

Expand All @@ -133,7 +133,7 @@ SignInComponent.prototype.init = function () {
});
};
} else if (!component.$usernameField.val() && component.$passwordField.val()) {
infoText = 'Enter your username';
infoText = '<i class="icon icon-exclamation-triangle"></i> Enter your username';
component.$usernameField.focus();

if (!component.$usernameField.prev('.signin__hint').length) {
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.datatables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ th.sorting_disabled:hover {
background: transparent;
border: 0;
box-sizing: border-box;
color: color(jadu-blue);
color: color(jadu-purple);
cursor: pointer;
display: none;
font-size: $font-size-base;
Expand Down
2 changes: 0 additions & 2 deletions stylesheets/_component.modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@

// Modal background
.modal__backdrop {
-webkit-backdrop-filter: blur(2px);
backdrop-filter: blur(2px);
position: fixed;
top: 0;
right: 0;
Expand Down
Loading

0 comments on commit f78a025

Please sign in to comment.