Merge branch 'develop' into main

jadu · Aug 5, 2022 · a099393 · a099393
2 parents 6c201b2 + f78a025
commit a099393
Show file tree

Hide file tree

Showing 5 changed files with 562 additions and 416 deletions.
diff --git a/js/area/signin/signin.js b/js/area/signin/signin.js
@@ -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(),
@@ -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
@@ -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();
 
@@ -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) {

diff --git a/stylesheets/_component.datatables.scss b/stylesheets/_component.datatables.scss
@@ -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;

diff --git a/stylesheets/_component.modals.scss b/stylesheets/_component.modals.scss
@@ -76,8 +76,6 @@
 
 // Modal background
 .modal__backdrop {
-    -webkit-backdrop-filter: blur(2px);
-    backdrop-filter: blur(2px);
     position: fixed;
     top: 0;
     right: 0;