#27112: fix border focus border color

MartijnCuppens · mdo · commit e3c0b3d3afc0 · 2018-09-02T16:25:55.000-07:00
diff --git 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
@@ -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);
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -258,10 +258,6 @@`
`258`	`258`	`&:focus ~ .custom-file-label {`
`259`	`259`	`border-color: $custom-file-focus-border-color;`
`260`	`260`	`box-shadow: $custom-file-focus-box-shadow;`
`261`		`-`
`262`		`- &::after {`
`263`		`- border-color: $custom-file-focus-border-color;`
`264`		`- }`
`265`	`261`	`}`
`266`	`262`
`267`	`263`	`&:disabled ~ .custom-file-label {`
`@@ -303,7 +299,7 @@`
`303`	`299`	`color: $custom-file-button-color;`
`304`	`300`	`content: "Browse";`
`305`	`301`	`@include gradient-bg($custom-file-button-bg);`
`306`		`- border-left: $custom-file-border-width solid $custom-file-border-color;`
	`302`	`+ border-left: inherit;`
`307`	`303`	`@include border-radius(0 $custom-file-border-radius $custom-file-border-radius 0);`
`308`	`304`	`}`
`309`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,6 @@`
`180`	`180`	`&.is-#{$state} {`
`181`	`181`	`~ .custom-file-label {`
`182`	`182`	`border-color: $color;`
`183`		`-`
`184`		`- &::after { border-color: inherit; }`
`185`	`183`	`}`
`186`	`184`
`187`	`185`	`~ .#{$state}-feedback,`
`@@ -191,6 +189,7 @@`
`191`	`189`
`192`	`190`	`&:focus {`
`193`	`191`	`~ .custom-file-label {`
	`192`	`+ border-color: $color;`
`194`	`193`	`box-shadow: 0 0 0 $input-focus-width rgba($color, .25);`
`195`	`194`	`}`
`196`	`195`	`}`