root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

unfuck that border from rem to px

This commit is contained in:
Mark Otto 2015-12-08 00:49:31 -08:00
parent 8fa5fb2857
commit ac5be12f24
9 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dist/css/bootstrap.css
View File

@ -3376,6 +3376,7 @@ input[type="button"].btn-block {
-webkit-appearance: none;
padding: .375rem 1.75rem .375rem .75rem;
padding-right: .75rem \9;
color: #55595c;
vertical-align: middle;
background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
background-image: none \9;
@ -3805,7 +3806,7 @@ input[type="button"].btn-block {
display: block;
margin-bottom: .75rem;
background-color: #fff;
border: .0625rem solid #e5e5e5;
border: 1px solid #e5e5e5;
border-radius: .25rem;
}
@ -3845,21 +3846,21 @@ input[type="button"].btn-block {
.card-header {
padding: .75rem 1.25rem;
background-color: #f5f5f5;
border-bottom: .0625rem solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
}
.card-header:first-child {
border-radius: .1875rem .1875rem 0 0;
border-radius: .25rem .25rem 0 0;
}
.card-footer {
padding: .75rem 1.25rem;
background-color: #f5f5f5;
border-top: .0625rem solid #e5e5e5;
border-top: 1px solid #e5e5e5;
}
.card-footer:last-child {
border-radius: 0 0 .1875rem .1875rem;
border-radius: 0 0 .25rem .25rem;
}
.card-primary {
@ -3919,7 +3920,7 @@ input[type="button"].btn-block {
.card-inverse .card-header,
.card-inverse .card-footer {
border-bottom: .0625rem solid rgba(255, 255, 255, .2);
border-bottom: 1px solid rgba(255, 255, 255, .2);
}
.card-inverse .card-header,
@ -3959,11 +3960,11 @@ input[type="button"].btn-block {
}
.card-img-top {
border-radius: .1875rem .1875rem 0 0;
border-radius: .25rem .25rem 0 0;
}
.card-img-bottom {
border-radius: 0 0 .1875rem .1875rem;
border-radius: 0 0 .25rem .25rem;
}
@media (min-width: 544px) {

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

17
docs/dist/css/bootstrap.css
View File

@ -3376,6 +3376,7 @@ input[type="button"].btn-block {
-webkit-appearance: none;
padding: .375rem 1.75rem .375rem .75rem;
padding-right: .75rem \9;
color: #55595c;
vertical-align: middle;
background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
background-image: none \9;
@ -3805,7 +3806,7 @@ input[type="button"].btn-block {
display: block;
margin-bottom: .75rem;
background-color: #fff;
border: .0625rem solid #e5e5e5;
border: 1px solid #e5e5e5;
border-radius: .25rem;
}
@ -3845,21 +3846,21 @@ input[type="button"].btn-block {
.card-header {
padding: .75rem 1.25rem;
background-color: #f5f5f5;
border-bottom: .0625rem solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
}
.card-header:first-child {
border-radius: .1875rem .1875rem 0 0;
border-radius: .25rem .25rem 0 0;
}
.card-footer {
padding: .75rem 1.25rem;
background-color: #f5f5f5;
border-top: .0625rem solid #e5e5e5;
border-top: 1px solid #e5e5e5;
}
.card-footer:last-child {
border-radius: 0 0 .1875rem .1875rem;
border-radius: 0 0 .25rem .25rem;
}
.card-primary {
@ -3919,7 +3920,7 @@ input[type="button"].btn-block {
.card-inverse .card-header,
.card-inverse .card-footer {
border-bottom: .0625rem solid rgba(255, 255, 255, .2);
border-bottom: 1px solid rgba(255, 255, 255, .2);
}
.card-inverse .card-header,
@ -3959,11 +3960,11 @@ input[type="button"].btn-block {
}
.card-img-top {
border-radius: .1875rem .1875rem 0 0;
border-radius: .25rem .25rem 0 0;
}
.card-img-bottom {
border-radius: 0 0 .1875rem .1875rem;
border-radius: 0 0 .25rem .25rem;
}
@media (min-width: 544px) {

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
scss/_variables.scss
View File

@ -459,10 +459,10 @@ $state-danger-border: darken($state-danger-bg, 5%) !default;
// Cards
$card-spacer-x: 1.25rem !default;
$card-spacer-y: .75rem !default;
$card-border-width: .0625rem !default;
$card-border-width: 1px !default;
$card-border-radius: $border-radius !default;
$card-border-color: #e5e5e5 !default;
$card-border-radius-inner: ($card-border-radius - $card-border-width) !default;
$card-border-radius-inner: $card-border-radius !default;
$card-cap-bg: #f5f5f5 !default;
$card-bg: #fff !default;