From e3c0b3d3afc0ffd9dc4bdf927bd3adfc4ff65cc6 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Sun, 26 Aug 2018 16:15:43 +0200
Subject: [PATCH] #27112: fix border focus border color

---
 scss/_custom-forms.scss | 6 +-----
 scss/mixins/_forms.scss | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 50b72cb942..8ef2e87b0b 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -258,10 +258,6 @@
   &:focus ~ .custom-file-label {
     border-color: $custom-file-focus-border-color;
     box-shadow: $custom-file-focus-box-shadow;
-
-    &::after {
-      border-color: $custom-file-focus-border-color;
-    }
   }
 
   &:disabled ~ .custom-file-label {
@@ -303,7 +299,7 @@
     color: $custom-file-button-color;
     content: "Browse";
     @include gradient-bg($custom-file-button-bg);
-    border-left: $custom-file-border-width solid $custom-file-border-color;
+    border-left: inherit;
     @include border-radius(0 $custom-file-border-radius $custom-file-border-radius 0);
   }
 }
diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 2b89390acc..90ecddee0c 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -180,8 +180,6 @@
     &.is-#{$state} {
       ~ .custom-file-label {
         border-color: $color;
-
-        &::after { border-color: inherit; }
       }
 
       ~ .#{$state}-feedback,
@@ -191,6 +189,7 @@
 
       &:focus {
         ~ .custom-file-label {
+          border-color: $color;
           box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
         }
       }