rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Jacob Thornton 2013-08-11 15:17:30 -07:00
commit b8ed111a18
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/bootstrap.css vendored
View File

@ -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;

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

File diff suppressed because one or more lines are too long

1
less/carousel.less
View File

@ -97,7 +97,6 @@
}
// Toggles
.glyphicon,
.icon-prev,
.icon-next {
position: absolute;

15
less/panels.less
View File

@ -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
// 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.
.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 {

2
less/scaffolding.less
View File

@ -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
}