Skip to content

Commit

Permalink
Revert input group border changes (#24197)
Browse files Browse the repository at this point in the history
Turns out #22612 is a bad idea and it makes all sorts of weird visual
glitches when working with form controls and transparent borders.
  • Loading branch information
mdo authored Oct 2, 2017
1 parent 49ce5f3 commit 8fb48ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
11 changes: 5 additions & 6 deletions scss/_custom-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
color: $custom-select-color;
vertical-align: middle;
background: $custom-select-bg $custom-select-indicator no-repeat right $custom-select-padding-x center;
background-clip: padding-box;
background-size: $custom-select-bg-size;
border: $custom-select-border-width solid $custom-select-border-color;
@if $enable-rounded {
Expand Down Expand Up @@ -216,13 +215,11 @@
z-index: 5;
height: $custom-file-height;
padding: $custom-file-padding-y $custom-file-padding-x;
overflow: hidden;
line-height: $custom-file-line-height;
color: $custom-file-color;
pointer-events: none;
user-select: none;
background-color: $custom-file-bg;
background-clip: padding-box;
border: $custom-file-border-width solid $custom-file-border-color;
@include border-radius($custom-file-border-radius);
@include box-shadow($custom-file-box-shadow);
Expand All @@ -235,16 +232,18 @@

&::before {
position: absolute;
top: 0;
right: 0;
top: -$custom-file-border-width;
right: -$custom-file-border-width;
bottom: -$custom-file-border-width;
z-index: 6;
display: block;
height: $custom-file-height;
padding: $custom-file-padding-y $custom-file-padding-x;
line-height: $custom-file-line-height;
color: $custom-file-button-color;
background-color: $custom-file-button-bg;
border-left: $custom-file-border-width solid $custom-file-border-color;
border: $custom-file-border-width solid $custom-file-border-color;
@include border-radius(0 $custom-file-border-radius $custom-file-border-radius 0);
}

@each $lang, $text in map-get($custom-file-text, button-label) {
Expand Down
3 changes: 0 additions & 3 deletions scss/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
color: $input-group-addon-color;
text-align: center;
background-color: $input-group-addon-bg;
background-clip: padding-box;
border: $input-btn-border-width solid $input-group-addon-border-color;
@include border-radius($input-border-radius);

Expand Down Expand Up @@ -144,8 +143,6 @@
// element above the siblings.
> .btn {
position: relative;
background-clip: padding-box;
border: $input-btn-border-width solid $input-group-btn-border-color;

+ .btn {
margin-left: (-$input-btn-border-width);
Expand Down
1 change: 0 additions & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ $form-group-margin-bottom: 1rem !default;
$input-group-addon-color: $input-color !default;
$input-group-addon-bg: $gray-200 !default;
$input-group-addon-border-color: $input-border-color !default;
$input-group-btn-border-color: $input-border-color !default;

$custom-control-gutter: 1.5rem !default;
$custom-control-spacer-y: .25rem !default;
Expand Down

0 comments on commit 8fb48ea

Please sign in to comment.