aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-16 20:25:40 -0800
committerMark Otto <[email protected]>2016-02-16 20:25:40 -0800
commite194db05c8494ccfe6de5c906e9c14b16daf61e8 (patch)
treef9ec60236ee4715e6b586b54b66bbafb89f86bb3 /dist/css/bootstrap.css
parent7441beba67bb2e387e647de5d7f69566565594a8 (diff)
parentaca4be6539b33d74b473c441c05b18f4dc850cb1 (diff)
downloadbootstrap-e194db05c8494ccfe6de5c906e9c14b16daf61e8.tar.xz
bootstrap-e194db05c8494ccfe6de5c906e9c14b16daf61e8.zip
Merge branch 'v4-dev' into mark-padding
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css8
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 5c346ac8d..85a6e30c2 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -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;
}