1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 12:21:35 +02:00

rewrite much of cards and the docs

This commit is contained in:
Mark Otto
2015-05-28 14:07:34 -07:00
parent e07cebc90e
commit 74d17ab7a0
3 changed files with 320 additions and 165 deletions

View File

@@ -2,28 +2,68 @@
// Base styles
//
$card-spacer-x: 1.25rem;
$card-spacer-y: .75rem;
$card-border-width: .0625rem;
$card-border-radius: .25rem;
.card {
position: relative;
padding: 1.25rem;
margin-bottom: 1.25rem;
border: .075rem solid #eee;
margin-bottom: $card-spacer-y;
border: $card-border-width solid #e5e5e5;
@include border-radius($card-border-radius);
}
.card-block {
padding: $card-spacer-x;
}
.card-title {
margin-top: 0;
margin-bottom: .75rem;
margin-bottom: $card-spacer-y;
}
.card-subtitle {
margin-top: -($card-spacer-y / 2);
margin-bottom: 0;
}
.card-text:last-child {
margin-bottom: 0;
}
.card-actions {
.card-link + .card-link {
margin-left: .75rem;
}
}
// .card-actions {
// padding: $card-spacer-y $card-spacer-x;
// .card-link + .card-link {
// margin-left: $card-spacer-x;
// }
// }
.card-link {
@include hover {
text-decoration: none;
}
+ .card-link {
margin-left: $card-spacer-x;
}
}
@if $enable-rounded {
.card {
> .list-group:first-child {
.list-group-item:first-child {
border-radius: $card-border-radius $card-border-radius 0 0;
}
}
> .list-group:last-child {
.list-group-item:last-child {
border-radius: 0 0 $card-border-radius $card-border-radius;
}
}
}
}
@@ -32,33 +72,21 @@
//
.card-header {
padding: .75rem 1.25rem;
margin: -1.25rem -1.25rem 1.25rem;
border-bottom: .075rem solid #eee;
@include border-radius(.25rem .25rem 0 0);
padding: $card-spacer-y $card-spacer-x;
border-bottom: $card-border-width solid #eee;
&:first-child {
@include border-radius($card-border-radius $card-border-radius 0 0);
}
}
.card-footer {
padding: .75rem 1.25rem;
margin: 1.25rem -1.25rem -1.25rem;
border-top: .075rem solid #eee;
@include border-radius(0 0 .25rem .25rem);
}
padding: $card-spacer-y $card-spacer-x;
border-top: $card-border-width solid #eee;
//
// Sizing variations
//
.card-sm {
width: 15rem;
}
.card-md {
width: 30rem;
}
.card-lg {
width: 45rem;
&:last-child {
@include border-radius(0 0 $card-border-radius $card-border-radius);
}
}
@@ -128,7 +156,7 @@
// Card image
.card-img {
margin: -1.325rem;
// margin: -1.325rem;
@include border-radius(.25rem);
}
.card-img-overlay {
@@ -144,11 +172,9 @@
// Card image caps
.card-img-top {
margin: -1.325rem -1.325rem 1.25rem;
@include border-radius(.25rem .25rem 0 0);
}
.card-img-bottom {
margin: 1.25rem -1.325rem -1.325rem;
@include border-radius(0 0 .25rem .25rem);
}
@@ -157,22 +183,36 @@
// Card set
//
.card-set {
display: table;
table-layout: fixed;
border-spacing: 1.25rem 0;
@if $enable-flex {
.card-deck {
display: flex;
flex-flow: row wrap;
margin-right: -.75rem;
margin-left: -.75rem;
.card {
display: table-cell;
float: none;
max-width: none;
.card {
flex: 1 0 0;
margin-left: .75rem;
margin-right: .75rem;
}
}
} @else {
.card-deck {
display: table;
table-layout: fixed;
border-spacing: 1.25rem 0;
.card {
display: table-cell;
float: none;
max-width: none;
}
}
.card-deck-wrapper {
margin-right: -1.25rem;
margin-left: -1.25rem;
}
}
.card-set-wrapper {
margin-right: -1.25rem;
margin-left: -1.25rem;
}
//
// Card groups
@@ -199,6 +239,38 @@
margin-left: 0;
border-left: 0;
}
// Handle rounded corners
&:first-child {
.card-img-top {
@if $enable-rounded {
border-top-right-radius: 0;
}
}
.card-img-bottom {
@if $enable-rounded {
border-bottom-right-radius: 0;
}
}
}
&:last-child {
.card-img-top {
@if $enable-rounded {
border-top-left-radius: 0;
}
}
.card-img-bottom {
@if $enable-rounded {
border-bottom-left-radius: 0;
}
}
}
&:not(:first-child):not(:last-child) {
.card-img-top,
.card-img-bottom {
@include border-radius(0);
}
}
}
}

View File

@@ -10,7 +10,7 @@
.list-group {
// No need to set list-style: none; since .list-group-item is block level
padding-left: 0; // reset padding because ul and ol
margin-bottom: 20px;
margin-bottom: 0;
}
@@ -21,11 +21,11 @@
.list-group-item {
position: relative;
display: block;
padding: 10px 15px;
padding: .75rem 1.25rem;
// Place the border on the list items and negative margin up for better styling
margin-bottom: -1px;
margin-bottom: -.0625rem;
background-color: $list-group-bg;
border: 1px solid $list-group-border;
border: .0625rem solid $list-group-border;
// Round the first and last items
&:first-child {
@@ -37,6 +37,13 @@
}
}
.list-group-flush {
.list-group-item {
border-width: .0625rem 0;
border-radius: 0;
}
}
// Linked list items
//