1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 02:24:19 +02:00

Merge branch 'v4-dev' into mark-padding

This commit is contained in:
Mark Otto
2016-02-16 20:25:40 -08:00
25 changed files with 64 additions and 33 deletions

View File

@@ -555,7 +555,7 @@ small,
mark,
.mark {
padding: .2em;
padding: 0.2em;
background-color: #fcf8e3;
}
@@ -4508,7 +4508,7 @@ input[type="button"].btn-block {
.label {
display: inline-block;
padding: .25em .4em;
padding: 0.25em 0.4em;
font-size: 75%;
font-weight: bold;
line-height: 1;
@@ -4535,8 +4535,8 @@ a.label:focus, a.label:hover {
}
.label-pill {
padding-right: .6em;
padding-left: .6em;
padding-right: 0.6em;
padding-left: 0.6em;
border-radius: 10rem;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long