Commit b8ed111a authored by Jacob Thornton's avatar Jacob Thornton

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

parents 89b3cb0d 9b07b999
......@@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text {
border-bottom: 0;
}
.panel-heading + .list-group {
margin-top: -15px;
}
.panel-heading + .list-group .list-group-item:first-child {
border-top-width: 0;
}
.panel-heading {
padding: 10px 15px;
margin: -15px -15px 15px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -97,7 +97,6 @@
}
// Toggles
.glyphicon,
.icon-prev,
.icon-next {
position: absolute;
......
......@@ -11,8 +11,14 @@
border: 1px solid @panel-border;
border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05));
}
// List groups in panels
//
// By default, space out list group content from panel headings to account for
// any kind of custom content between the two.
// List groups in panels
.panel {
.list-group {
margin: 15px -15px -15px;
......@@ -30,6 +36,13 @@
}
}
}
// Collapse space between when there's no additional content.
.panel-heading + .list-group {
margin-top: -15px;
.list-group-item:first-child {
border-top-width: 0;
}
}
// Optional heading
.panel-heading {
......
......@@ -79,7 +79,7 @@ img {
// Perfect circle
.img-circle {
border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
border-radius: 50%; // set radius in percents
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment