diff options
| author | Mark Otto <[email protected]> | 2016-02-03 20:53:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-03 20:53:30 -0800 |
| commit | b75116c679bc6647d1a4f9c0ae577f6a8635b1b4 (patch) | |
| tree | 720a1e7d79eb8019e45498497879db6a63958fbf /dist/css/bootstrap.css | |
| parent | 0f18bd3257c5e253f71ce9e132933393438f4284 (diff) | |
| parent | f31575ad63e7eb2dd0dc690dcdf26ac45d39f7a4 (diff) | |
| download | bootstrap-b75116c679bc6647d1a4f9c0ae577f6a8635b1b4.tar.xz bootstrap-b75116c679bc6647d1a4f9c0ae577f6a8635b1b4.zip | |
Merge branch 'v4-card-fuckery' into v4-dev
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c18ccbf45..246b8b68b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3767,8 +3767,9 @@ input[type="button"].btn-block { display: block; margin-bottom: .75rem; background-color: #fff; - border: 1px solid #e5e5e5; border-radius: .25rem; + -webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); } .card-block { @@ -3813,7 +3814,8 @@ input[type="button"].btn-block { .card-header { padding: .75rem 1.25rem; background-color: #f5f5f5; - border-bottom: 1px solid #e5e5e5; + -webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); } .card-header::after { @@ -3829,7 +3831,8 @@ input[type="button"].btn-block { .card-footer { padding: .75rem 1.25rem; background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; + -webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, .125); } .card-footer::after { @@ -3842,6 +3845,22 @@ input[type="button"].btn-block { border-radius: 0 0 .25rem .25rem; } +.card-header-tabs { + margin-right: -.625rem; + margin-bottom: -.75rem; + margin-left: -.625rem; + border-bottom: 0; +} + +.card-header-tabs .nav-item { + margin-bottom: 0; +} + +.card-header-pills { + margin-right: -.625rem; + margin-left: -.625rem; +} + .card-primary { background-color: #0275d8; border-color: #0275d8; @@ -4633,18 +4652,9 @@ base::-moz-progress-bar, } .list-group-flush .list-group-item { - border-width: 1px 0; border-radius: 0; } -.list-group-flush:first-child .list-group-item:first-child { - border-top: 0; -} - -.list-group-flush:last-child .list-group-item:last-child { - border-bottom: 0; -} - a.list-group-item, button.list-group-item { width: 100%; |
