From c9cadab3cf9ba1e63e3d0842b940f6979b1daa1b Mon Sep 17 00:00:00 2001
From: Dmitry Karpunin <koderfunk@gmail.com>
Date: Tue, 6 Jun 2023 19:28:47 +0300
Subject: [PATCH 1/2] Fix focus box-shadow for validation stated form-controls

---
 scss/mixins/_forms.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index d47b1e41d63e..ed0d26741c9a 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -69,7 +69,12 @@
 
       &:focus {
         border-color: $border-color;
-        box-shadow: $focus-box-shadow;
+        @if $enable-shadows {
+          @include box-shadow($input-box-shadow, $focus-box-shadow);
+        } @else {
+          // Avoid using mixin so we can pass custom focus shadow properly
+          box-shadow: $focus-box-shadow;
+        }
       }
     }
   }

From e971c3460f8e3e31e4b62e447374db92cd39bc62 Mon Sep 17 00:00:00 2001
From: Dmitry Karpunin <ext-dmitriy.karpunin@sbermarket.ru>
Date: Sat, 2 Dec 2023 17:10:27 +0300
Subject: [PATCH 2/2] Fix focus box-shadows of form-select

---
 scss/mixins/_forms.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index ed0d26741c9a..00b476413463 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -105,7 +105,12 @@
 
       &:focus {
         border-color: $border-color;
-        box-shadow: $focus-box-shadow;
+        @if $enable-shadows {
+          @include box-shadow($form-select-box-shadow, $focus-box-shadow);
+        } @else {
+          // Avoid using mixin so we can pass custom focus shadow properly
+          box-shadow: $focus-box-shadow;
+        }
       }
     }
   }