1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 00:29:52 +02:00

Merge branch 'v4-dev' into btn_input_split_variables

This commit is contained in:
Mark Otto
2017-10-22 14:26:49 -07:00
committed by GitHub
180 changed files with 1382 additions and 1203 deletions

View File

@@ -12,8 +12,6 @@
line-height: $input-line-height;
color: $input-color;
background-color: $input-bg;
// Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
background-image: none;
background-clip: padding-box;
border: $input-border-width solid $input-border-color;
@@ -129,6 +127,8 @@ select.form-control {
// text (without any border, background color, focus indicator)
.form-control-plaintext {
display: block;
width: 100%;
padding-top: $input-padding-y;
padding-bottom: $input-padding-y;
margin-bottom: 0; // match inputs if this class comes on inputs with default margins