0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-04-02 20:25:19 +02:00
This commit is contained in:
Mark Otto 2016-05-11 23:24:40 -07:00
parent fc75a2c78f
commit 1f25326926
8 changed files with 72 additions and 28 deletions

@ -4201,8 +4201,7 @@ input[type="button"].btn-block {
.card-header { .card-header {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: #f5f5f5; background-color: #f5f5f5;
-webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); border-bottom: 1px solid rgba(0, 0, 0, 0.125);
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125);
} }
.card-header::after { .card-header::after {
@ -4218,8 +4217,7 @@ input[type="button"].btn-block {
.card-footer { .card-footer {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: #f5f5f5; background-color: #f5f5f5;
-webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); border-top: 1px solid rgba(0, 0, 0, 0.125);
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125);
} }
.card-footer::after { .card-footer::after {
@ -4239,10 +4237,6 @@ input[type="button"].btn-block {
border-bottom: 0; border-bottom: 0;
} }
.card-header-tabs .nav-item {
margin-bottom: 0;
}
.card-header-pills { .card-header-pills {
margin-right: -0.625rem; margin-right: -0.625rem;
margin-left: -0.625rem; margin-left: -0.625rem;
@ -4253,26 +4247,51 @@ input[type="button"].btn-block {
border-color: #0275d8; border-color: #0275d8;
} }
.card-primary .card-header,
.card-primary .card-footer {
background-color: transparent;
}
.card-success { .card-success {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #5cb85c; border-color: #5cb85c;
} }
.card-success .card-header,
.card-success .card-footer {
background-color: transparent;
}
.card-info { .card-info {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #5bc0de; border-color: #5bc0de;
} }
.card-info .card-header,
.card-info .card-footer {
background-color: transparent;
}
.card-warning { .card-warning {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.card-warning .card-header,
.card-warning .card-footer {
background-color: transparent;
}
.card-danger { .card-danger {
background-color: #d9534f; background-color: #d9534f;
border-color: #d9534f; border-color: #d9534f;
} }
.card-danger .card-header,
.card-danger .card-footer {
background-color: transparent;
}
.card-outline-primary { .card-outline-primary {
background-color: transparent; background-color: transparent;
border-color: #0275d8; border-color: #0275d8;
@ -4305,7 +4324,7 @@ input[type="button"].btn-block {
.card-inverse .card-header, .card-inverse .card-header,
.card-inverse .card-footer { .card-inverse .card-footer {
border-bottom: 1px solid rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2);
} }
.card-inverse .card-header, .card-inverse .card-header,
@ -4317,7 +4336,8 @@ input[type="button"].btn-block {
.card-inverse .card-link, .card-inverse .card-link,
.card-inverse .card-text, .card-inverse .card-text,
.card-inverse .card-blockquote > footer { .card-inverse .card-subtitle,
.card-inverse .card-blockquote .blockquote-footer {
color: rgba(255, 255, 255, 0.65); color: rgba(255, 255, 255, 0.65);
} }
@ -4357,12 +4377,14 @@ input[type="button"].btn-block {
@media (min-width: 544px) { @media (min-width: 544px) {
.card-deck { .card-deck {
display: table; display: table;
width: 100%;
margin-bottom: 0.75rem;
table-layout: fixed; table-layout: fixed;
border-spacing: 1.25rem 0; border-spacing: 1.25rem 0;
} }
.card-deck .card { .card-deck .card {
display: table-cell; display: table-cell;
width: 1%; margin-bottom: 0;
vertical-align: top; vertical-align: top;
} }
.card-deck-wrapper { .card-deck-wrapper {

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

@ -4201,8 +4201,7 @@ input[type="button"].btn-block {
.card-header { .card-header {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: #f5f5f5; background-color: #f5f5f5;
-webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); border-bottom: 1px solid rgba(0, 0, 0, 0.125);
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125);
} }
.card-header::after { .card-header::after {
@ -4218,8 +4217,7 @@ input[type="button"].btn-block {
.card-footer { .card-footer {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: #f5f5f5; background-color: #f5f5f5;
-webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); border-top: 1px solid rgba(0, 0, 0, 0.125);
box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125);
} }
.card-footer::after { .card-footer::after {
@ -4239,10 +4237,6 @@ input[type="button"].btn-block {
border-bottom: 0; border-bottom: 0;
} }
.card-header-tabs .nav-item {
margin-bottom: 0;
}
.card-header-pills { .card-header-pills {
margin-right: -0.625rem; margin-right: -0.625rem;
margin-left: -0.625rem; margin-left: -0.625rem;
@ -4253,26 +4247,51 @@ input[type="button"].btn-block {
border-color: #0275d8; border-color: #0275d8;
} }
.card-primary .card-header,
.card-primary .card-footer {
background-color: transparent;
}
.card-success { .card-success {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #5cb85c; border-color: #5cb85c;
} }
.card-success .card-header,
.card-success .card-footer {
background-color: transparent;
}
.card-info { .card-info {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #5bc0de; border-color: #5bc0de;
} }
.card-info .card-header,
.card-info .card-footer {
background-color: transparent;
}
.card-warning { .card-warning {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.card-warning .card-header,
.card-warning .card-footer {
background-color: transparent;
}
.card-danger { .card-danger {
background-color: #d9534f; background-color: #d9534f;
border-color: #d9534f; border-color: #d9534f;
} }
.card-danger .card-header,
.card-danger .card-footer {
background-color: transparent;
}
.card-outline-primary { .card-outline-primary {
background-color: transparent; background-color: transparent;
border-color: #0275d8; border-color: #0275d8;
@ -4305,7 +4324,7 @@ input[type="button"].btn-block {
.card-inverse .card-header, .card-inverse .card-header,
.card-inverse .card-footer { .card-inverse .card-footer {
border-bottom: 1px solid rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2);
} }
.card-inverse .card-header, .card-inverse .card-header,
@ -4317,7 +4336,8 @@ input[type="button"].btn-block {
.card-inverse .card-link, .card-inverse .card-link,
.card-inverse .card-text, .card-inverse .card-text,
.card-inverse .card-blockquote > footer { .card-inverse .card-subtitle,
.card-inverse .card-blockquote .blockquote-footer {
color: rgba(255, 255, 255, 0.65); color: rgba(255, 255, 255, 0.65);
} }
@ -4357,12 +4377,14 @@ input[type="button"].btn-block {
@media (min-width: 544px) { @media (min-width: 544px) {
.card-deck { .card-deck {
display: table; display: table;
width: 100%;
margin-bottom: 0.75rem;
table-layout: fixed; table-layout: fixed;
border-spacing: 1.25rem 0; border-spacing: 1.25rem 0;
} }
.card-deck .card { .card-deck .card {
display: table-cell; display: table-cell;
width: 1%; margin-bottom: 0;
vertical-align: top; vertical-align: top;
} }
.card-deck-wrapper { .card-deck-wrapper {

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