mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 06:44:35 +02:00
Code Issues Releases Wiki Activity

Revert input group border changes (#24197)

Browse Source 
Turns out #22612 is a bad idea and it makes all sorts of weird visual
glitches when working with form controls and transparent borders.
This commit is contained in:
Mark Otto
2017-10-02 14:18:33 -07:00
committed by GitHub
parent 49ce5f3a64
commit 8fb48eaae2
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scss/_custom-forms.scss
View File

@@ -139,7 +139,6 @@
color: $custom-select-color; color: $custom-select-color;
vertical-align: middle; vertical-align: middle;
background: $custom-select-bg $custom-select-indicator no-repeat right $custom-select-padding-x center; 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; background-size: $custom-select-bg-size;
border: $custom-select-border-width solid $custom-select-border-color; border: $custom-select-border-width solid $custom-select-border-color;
@if $enable-rounded { @if $enable-rounded {
@@ -216,13 +215,11 @@
z-index: 5; z-index: 5;
height: $custom-file-height; height: $custom-file-height;
padding: $custom-file-padding-y $custom-file-padding-x; padding: $custom-file-padding-y $custom-file-padding-x;
overflow: hidden;
line-height: $custom-file-line-height; line-height: $custom-file-line-height;
color: $custom-file-color; color: $custom-file-color;
pointer-events: none; pointer-events: none;
user-select: none; user-select: none;
background-color: $custom-file-bg; background-color: $custom-file-bg;
background-clip: padding-box;
border: $custom-file-border-width solid $custom-file-border-color; border: $custom-file-border-width solid $custom-file-border-color;
@include border-radius($custom-file-border-radius); @include border-radius($custom-file-border-radius);
@include box-shadow($custom-file-box-shadow); @include box-shadow($custom-file-box-shadow);
@@ -235,8 +232,9 @@
&::before { &::before {
position: absolute; position: absolute;
top: 0; top: -$custom-file-border-width;
right: 0; right: -$custom-file-border-width;
bottom: -$custom-file-border-width;
z-index: 6; z-index: 6;
display: block; display: block;
height: $custom-file-height; height: $custom-file-height;
@@ -244,7 +242,8 @@
line-height: $custom-file-line-height; line-height: $custom-file-line-height;
color: $custom-file-button-color; color: $custom-file-button-color;
background-color: $custom-file-button-bg; 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) { @each $lang, $text in map-get($custom-file-text, button-label) {

3
scss/_input-group.scss
View File

@@ -72,7 +72,6 @@
color: $input-group-addon-color; color: $input-group-addon-color;
text-align: center; text-align: center;
background-color: $input-group-addon-bg; background-color: $input-group-addon-bg;
background-clip: padding-box;
border: $input-btn-border-width solid $input-group-addon-border-color; border: $input-btn-border-width solid $input-group-addon-border-color;
@include border-radius($input-border-radius); @include border-radius($input-border-radius);
@@ -144,8 +143,6 @@
// element above the siblings. // element above the siblings.
> .btn { > .btn {
position: relative; position: relative;
background-clip: padding-box;
border: $input-btn-border-width solid $input-group-btn-border-color;
+ .btn { + .btn {
margin-left: (-$input-btn-border-width); margin-left: (-$input-btn-border-width);

1
scss/_variables.scss
View File

@@ -371,7 +371,6 @@ $form-group-margin-bottom: 1rem !default;
$input-group-addon-color: $input-color !default; $input-group-addon-color: $input-color !default;
$input-group-addon-bg: $gray-200 !default; $input-group-addon-bg: $gray-200 !default;
$input-group-addon-border-color: $input-border-color !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-gutter: 1.5rem !default;
$custom-control-spacer-y: .25rem !default; $custom-control-spacer-y: .25rem !default;