From a784d7dd52796a7c5151ff5b577067e4d2b4e771 Mon Sep 17 00:00:00 2001 From: nnguyen26 Date: Tue, 18 Mar 2025 23:26:44 -0500 Subject: [PATCH 1/4] Fixed Button toggle method --- startbootstrap-sb-admin-2 | 1 + vendor/bootstrap/js/bootstrap.bundle.js | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 160000 startbootstrap-sb-admin-2 diff --git a/startbootstrap-sb-admin-2 b/startbootstrap-sb-admin-2 new file mode 160000 index 000000000..f0309881e --- /dev/null +++ b/startbootstrap-sb-admin-2 @@ -0,0 +1 @@ +Subproject commit f0309881ef82794a1bd6257cd321801bc38a0f3d diff --git a/vendor/bootstrap/js/bootstrap.bundle.js b/vendor/bootstrap/js/bootstrap.bundle.js index d5c19832a..94ef4efe9 100644 --- a/vendor/bootstrap/js/bootstrap.bundle.js +++ b/vendor/bootstrap/js/bootstrap.bundle.js @@ -428,44 +428,46 @@ var triggerChangeEvent = true; var addAriaPressed = true; var rootElement = $__default['default'](this._element).closest(SELECTOR_DATA_TOGGLES)[0]; - + if (rootElement) { var input = this._element.querySelector(SELECTOR_INPUT); - + if (input) { if (input.type === 'radio') { if (input.checked && this._element.classList.contains(CLASS_NAME_ACTIVE)) { triggerChangeEvent = false; } else { var activeElement = rootElement.querySelector(SELECTOR_ACTIVE); - + if (activeElement) { $__default['default'](activeElement).removeClass(CLASS_NAME_ACTIVE); } } } - + if (triggerChangeEvent) { // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input if (input.type === 'checkbox' || input.type === 'radio') { input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE); } - - if (!this.shouldAvoidTriggerChange) { + + // Only trigger change if shouldAvoidTriggerChange is explicitly false + // This fixes the bug where change is always triggered regardless of shouldAvoidTriggerChange value + if (this.shouldAvoidTriggerChange === false) { $__default['default'](input).trigger('change'); } } - + input.focus(); addAriaPressed = false; } } - + if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) { if (addAriaPressed) { this._element.setAttribute('aria-pressed', !this._element.classList.contains(CLASS_NAME_ACTIVE)); } - + if (triggerChangeEvent) { $__default['default'](this._element).toggleClass(CLASS_NAME_ACTIVE); } From 8fec753cd01abf6d26ec54106c0fd868ae2b3717 Mon Sep 17 00:00:00 2001 From: nnguyen26 Date: Wed, 19 Mar 2025 23:24:15 -0500 Subject: [PATCH 2/4] modified for better accessibility & usability --- forgot-password.html | 204 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 183 insertions(+), 21 deletions(-) diff --git a/forgot-password.html b/forgot-password.html index 5f198c15f..c76037d60 100644 --- a/forgot-password.html +++ b/forgot-password.html @@ -2,14 +2,13 @@ - - + - SB Admin 2 - Forgot Password + SB Admin 2 - Login @@ -20,9 +19,57 @@ + + - +
@@ -31,45 +78,93 @@
-
+
-
+
+ +
-

Forgot Your Password?

-

We get it, stuff happens. Just enter your email address below - and we'll send you a link to reset your password!

+ + +

Welcome Back!

-
+ + +
+ + +
+ + + + + + +
+ id="emailInput" name="email" aria-describedby="emailHelp" + placeholder="Enter Email Address..." required autocomplete="email"> +
Please enter a valid email address
+
+
+
+ +
+ +
+
+
Please enter your password
- - Reset Password - +
+
+ + +
+
+ + + + +
- Create an Account! + Forgot Password?
- Already have an account? Login! + Create an Account!
-
-
-
@@ -81,7 +176,74 @@

Forgot Your Password?

- + + + \ No newline at end of file From 2075c97bef2b8551fbab42a6d74f320f7c1b98e2 Mon Sep 17 00:00:00 2001 From: nnguyen26 Date: Wed, 19 Mar 2025 23:37:21 -0500 Subject: [PATCH 3/4] enhance the functionality and user experience --- forgot-password.html | 204 +++++-------------------------------------- login.html | 198 +++++++++++++++++++++++++++++++++++------ 2 files changed, 193 insertions(+), 209 deletions(-) diff --git a/forgot-password.html b/forgot-password.html index c76037d60..5f198c15f 100644 --- a/forgot-password.html +++ b/forgot-password.html @@ -2,13 +2,14 @@ + - + - SB Admin 2 - Login + SB Admin 2 - Forgot Password @@ -19,57 +20,9 @@ - - - +
@@ -78,93 +31,45 @@
-
+
-
- -
+
- - -

Welcome Back!

+

Forgot Your Password?

+

We get it, stuff happens. Just enter your email address below + and we'll send you a link to reset your password!

- - -
- - -
- - - -
- - - +
-
Please enter a valid email address
-
-
-
- -
- -
-
-
Please enter your password
+ id="exampleInputEmail" aria-describedby="emailHelp" + placeholder="Enter Email Address...">
-
-
- - -
-
- - - - - + + Reset Password +
- Forgot Password? + Create an Account!
- Create an Account! + Already have an account? Login!
+
+
+
@@ -176,74 +81,7 @@

Welcome Back!

- - - + \ No newline at end of file diff --git a/login.html b/login.html index f4fa58e6c..c76037d60 100644 --- a/login.html +++ b/login.html @@ -2,11 +2,10 @@ - - + SB Admin 2 - Login @@ -20,9 +19,57 @@ + + - +
@@ -31,43 +78,78 @@
-
+
- +
+ +
-

Welcome Back!

+ + +

Welcome Back!

+
+ + +
+ + +
+ + -
+ + + + +
+ id="emailInput" name="email" aria-describedby="emailHelp" + placeholder="Enter Email Address..." required autocomplete="email"> +
Please enter a valid email address
- +
+ +
+ +
+
+
Please enter your password
- -
- + + + + +
@@ -81,11 +163,8 @@

Welcome Back!

-
-
-
@@ -97,7 +176,74 @@

Welcome Back!

- + + + \ No newline at end of file From 0611f5144af0fa1f0270c5a1cd5c42529d1a4594 Mon Sep 17 00:00:00 2001 From: nnguyen26 Date: Wed, 19 Mar 2025 23:49:18 -0500 Subject: [PATCH 4/4] enhance the UI/UX design of forgot password section --- forgot-password.html | 95 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 11 deletions(-) diff --git a/forgot-password.html b/forgot-password.html index 5f198c15f..49cf4f715 100644 --- a/forgot-password.html +++ b/forgot-password.html @@ -9,7 +9,7 @@ - SB Admin 2 - Forgot Password + SB Admin 2 - Login @@ -20,6 +20,63 @@ + + + @@ -35,30 +92,46 @@
-
+
-

Forgot Your Password?

-

We get it, stuff happens. Just enter your email address below - and we'll send you a link to reset your password!

+

Welcome Back!

+ placeholder="Enter Email Address..." required> +
+
+ +
+
+
+ + +
- - Reset Password + + Login + +
+ + Login with Google + + + Login with Facebook
- Create an Account! + Forgot Password?
- Already have an account? Login! + Create an Account!
@@ -84,4 +157,4 @@

Forgot Your Password?

- \ No newline at end of file +