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

20111564 · Aug 11, 2013 · b8ed111 · b8ed111
2 parents 89b3cb0 + 9b07b99
commit b8ed111
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -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;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/carousel.less b/less/carousel.less
@@ -97,7 +97,6 @@
   }
 
   // Toggles
-  .glyphicon,
   .icon-prev,
   .icon-next {
     position: absolute;

diff --git a/less/panels.less b/less/panels.less
@@ -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 {

diff --git a/less/scaffolding.less b/less/scaffolding.less
@@ -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
 }