Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Conflicts:
	dist/css/bootstrap.min.css

_includes/nav-getting-started.html

@@ -18,6 +18,9 @@
 <li>
   <a href="#disable-responsive">Disabling responsiveness</a>
 </li>
+<li>
+  <a href="#migration">Migration</a>
+</li>
 <li>
   <a href="#browsers">Browser support</a>
 </li>

components.html

@@ -2287,7 +2287,7 @@ body { padding-bottom: 70px; }
     </div>
 
     <h3 id="progress-basic">Basic example</h3>
-    <p>Default progress bar with a vertical gradient.</p>
+    <p>Default progress bar.</p>
     <div class="bs-example">
       <div class="progress">
         <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div>

dist/css/bootstrap.css

@@ -3449,11 +3449,12 @@ input[type="button"].btn-block {
 }
 
 .btn-lg .caret {
-  border-width: 5px;
+  border-width: 5px 5px 0;
+  border-bottom-width: 0;
 }
 
 .dropup .btn-lg .caret {
-  border-bottom-width: 5px;
+  border-width: 0 5px 5px;
 }
 
 .btn-group-vertical > .btn,

examples/jumbotron/index.html

@@ -75,8 +75,6 @@
     </div>
 
     <div class="container">
-      <div class="body-content">
-
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
@@ -101,8 +99,6 @@
       <footer>
         <p>&copy; Company 2013</p>
       </footer>
-      </div>
-
     </div> <!-- /container -->
 
 

examples/jumbotron/jumbotron.css

@@ -3,18 +3,3 @@ body {
   padding-top: 50px;
   padding-bottom: 20px;
 }
-
-/* Wrapping element */
-/* Set some basic padding to keep content from hitting the edges */
-.body-content {
-  padding-left: 15px;
-  padding-right: 15px;
-}
-
-/* Responsive: Portrait tablets and up */
-@media screen and (min-width: 768px) {
-  /* Remove padding from wrapping element since we kick in the grid classes here */
-  .body-content {
-    padding: 0;
-  }
-}
\ No newline at end of file

examples/justified-nav/index.html

@@ -45,9 +45,6 @@
         <p><a class="btn btn-lg btn-success" href="#">Get started today</a></p>
       </div>
 
-
-      <div class="body-content">
-
       <!-- Example row of columns -->
       <div class="row">
         <div class="col-lg-4">
@@ -67,8 +64,6 @@
         </div>
       </div>
 
-      </div><!-- /.body-content -->
-
       <!-- Site footer -->
       <div class="footer">
         <p>&copy; Company 2013</p>

examples/justified-nav/justified-nav.css

@@ -2,13 +2,6 @@ body {
   padding-top: 20px;
 }
 
-/* Everything but the jumbotron gets side spacing for mobile-first views */
-.masthead,
-.footer {
-  padding-left: 15px;
-  padding-right: 15px;
-}
-
 .footer {
   border-top: 1px solid #eee;
   margin-top: 40px;

less/button-groups.less

@@ -159,11 +159,12 @@
 }
 // Carets in other button sizes
 .btn-lg .caret {
-  border-width: @caret-width-large;
+  border-width: @caret-width-large @caret-width-large 0;
+  border-bottom-width: 0;
 }
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
-  border-bottom-width: @caret-width-large;
+  border-width: 0 @caret-width-large @caret-width-large;
 }
 
 

less/theme.less

@@ -94,7 +94,7 @@
 // Basic navbar
 .navbar {
   #gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;);
-  border-radius: @border-radius-base;
+  border-radius: @navbar-border-radius;
   @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
   .box-shadow(@shadow);