From e9c66560041bd777a0381241adbdfff89309f03f Mon Sep 17 00:00:00 2001
From: Sharrell Porter <SharrellPorter@example.com>
Date: Mon, 16 Oct 2017 16:57:13 -0400
Subject: [PATCH 1/4] correcting color

---
 scss/mixins/_forms.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 6403f469d929..f69b335e1d41 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -79,6 +79,7 @@
     &.is-#{$state} {
       ~ .custom-control-indicator {
         background-color: rgba($color, .25);
+        box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dc3545;
       }
       ~ .custom-control-description {
         color: $color;

From 809ce6d6ef231b771d2ba8356d8e5b89a0cdda07 Mon Sep 17 00:00:00 2001
From: Sharrell Porter <SharrellPorter@example.com>
Date: Fri, 20 Oct 2017 07:23:48 -0400
Subject: [PATCH 2/4] Sass correction

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

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 3adbc1dd214a..34405810ac4e 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -84,7 +84,10 @@
     &.is-#{$state} {
       ~ .custom-control-indicator {
         background-color: rgba($color, .25);
-        box-shadow: 0 0 0 1px #fff, 0 0 0 3px #dc3545;
+      }
+    &:focus {
+      ~ .custom-control-indicator {
+      box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px $color;
       }
       ~ .custom-control-description {
         color: $color;
@@ -103,6 +106,7 @@
       }
       &:focus {
         box-shadow: 0 0 0 .2rem rgba($color,.25);
+        
       }
     }
   }

From 7eb8c54858eb43901c4e3583111f81a66bb35ea7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 21 Oct 2017 20:55:01 -0700
Subject: [PATCH 3/4] use vars, fix indentation

---
 scss/mixins/_forms.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 34405810ac4e..88582ed86cb7 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -57,7 +57,7 @@
       border-color: $color;
 
       &:focus {
-        box-shadow: 0 0 0 .2rem rgba($color,.25);
+        box-shadow: 0 0 0 $input-btn-focus-width rgba($color,.25);
       }
 
       ~ .#{$state}-feedback,
@@ -87,7 +87,7 @@
       }
     &:focus {
       ~ .custom-control-indicator {
-      box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px $color;
+        box-shadow: 0 0 0 1px $body-bg, 0 0 0 $input-btn-focus-width $color;
       }
       ~ .custom-control-description {
         color: $color;
@@ -105,8 +105,7 @@
         &::before { border-color: inherit; }
       }
       &:focus {
-        box-shadow: 0 0 0 .2rem rgba($color,.25);
-        
+        box-shadow: 0 0 0 $input-btn-focus-width rgba($color,.25);
       }
     }
   }

From 1083e49bbe522b980872b603e0fb30eca3bfa233 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 21 Oct 2017 20:57:19 -0700
Subject: [PATCH 4/4] really fix indentation, reorder

---
 scss/mixins/_forms.scss | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 88582ed86cb7..0124199d4585 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -85,13 +85,14 @@
       ~ .custom-control-indicator {
         background-color: rgba($color, .25);
       }
-    &:focus {
-      ~ .custom-control-indicator {
-        box-shadow: 0 0 0 1px $body-bg, 0 0 0 $input-btn-focus-width $color;
-      }
       ~ .custom-control-description {
         color: $color;
       }
+      &:focus {
+        ~ .custom-control-indicator {
+          box-shadow: 0 0 0 1px $body-bg, 0 0 0 $input-btn-focus-width $color;
+        }
+      }
     }
   }