mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-11 08:54:23 +01:00
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
This commit is contained in:
commit
b8ed111a18
8
dist/css/bootstrap.css
vendored
8
dist/css/bootstrap.css
vendored
@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text {
|
|||||||
border-bottom: 0;
|
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 {
|
.panel-heading {
|
||||||
padding: 10px 15px;
|
padding: 10px 15px;
|
||||||
margin: -15px -15px 15px;
|
margin: -15px -15px 15px;
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -97,7 +97,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Toggles
|
// Toggles
|
||||||
.glyphicon,
|
|
||||||
.icon-prev,
|
.icon-prev,
|
||||||
.icon-next {
|
.icon-next {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
@ -11,8 +11,14 @@
|
|||||||
border: 1px solid @panel-border;
|
border: 1px solid @panel-border;
|
||||||
border-radius: @panel-border-radius;
|
border-radius: @panel-border-radius;
|
||||||
.box-shadow(0 1px 1px rgba(0,0,0,.05));
|
.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 {
|
.list-group {
|
||||||
margin: 15px -15px -15px;
|
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
|
// Optional heading
|
||||||
.panel-heading {
|
.panel-heading {
|
||||||
|
@ -79,7 +79,7 @@ img {
|
|||||||
|
|
||||||
// Perfect circle
|
// Perfect circle
|
||||||
.img-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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user