1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
This commit is contained in:
Mark Otto 2017-10-18 20:38:08 -07:00
parent a62ced0e0b
commit 4a603f11e5
6 changed files with 10 additions and 19 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -433,7 +433,7 @@ h1, h2, h3, h4, h5, h6,
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
font-family: inherit; font-family: inherit;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.2;
color: inherit; color: inherit;
} }
@ -469,25 +469,25 @@ h6, .h6 {
.display-1 { .display-1 {
font-size: 6rem; font-size: 6rem;
font-weight: 300; font-weight: 300;
line-height: 1.1; line-height: 1.2;
} }
.display-2 { .display-2 {
font-size: 5.5rem; font-size: 5.5rem;
font-weight: 300; font-weight: 300;
line-height: 1.1; line-height: 1.2;
} }
.display-3 { .display-3 {
font-size: 4.5rem; font-size: 4.5rem;
font-weight: 300; font-weight: 300;
line-height: 1.1; line-height: 1.2;
} }
.display-4 { .display-4 {
font-size: 3.5rem; font-size: 3.5rem;
font-weight: 300; font-weight: 300;
line-height: 1.1; line-height: 1.2;
} }
hr { hr {
@ -1882,11 +1882,6 @@ pre code {
opacity: 1; opacity: 1;
} }
.form-control::-ms-input-placeholder {
color: #868e96;
opacity: 1;
}
.form-control::placeholder { .form-control::placeholder {
color: #868e96; color: #868e96;
opacity: 1; opacity: 1;
@ -2225,10 +2220,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-inline .input-group { .form-inline .input-group {
width: auto; width: auto;
} }
.form-inline .form-control-label {
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .form-check { .form-inline .form-check {
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long