Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less

7 files changed, 0 insertions, 245 deletions

diff --git a/docs/examples/blog/blog.css b/docs/examples/blog/blog.css
index 9d7298160..f9106eb47 100644
--- a/docs/examples/blog/blog.css
+++ b/docs/examples/blog/blog.css
@@ -120,7 +120,6 @@ h6, .h6 {
 }
 
 
-
 /* Pagination */
 .pager {
   margin-bottom: 60px;
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css
index a5143f5e0..8833f82dd 100644
--- a/docs/examples/carousel/carousel.css
+++ b/docs/examples/carousel/carousel.css
@@ -8,7 +8,6 @@ body {
 }
 
 
-
 /* CUSTOMIZE THE NAVBAR
 -------------------------------------------------- */
 
@@ -62,7 +61,6 @@ body {
 }
 
 
-
 /* MARKETING CONTENT
 -------------------------------------------------- */
 
@@ -95,7 +93,6 @@ body {
 }
 
 
-
 /* RESPONSIVE CSS
 -------------------------------------------------- */
 
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index ec31b8155..5668bab8b 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -114,7 +114,6 @@
     </div><!-- /.carousel -->
 
 
-
     <!-- Marketing messaging and featurettes
     ================================================== -->
     <!-- Wrap the rest of the page in another container to center all the content. -->
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 229c148fe..81de02d71 100644
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -113,7 +113,6 @@
     </div><!--/.container-->
 
 
-
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index 7b817f4b9..645c1024e 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -68,7 +68,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Buttons</h1>
       </div>
@@ -110,7 +109,6 @@
       </p>
 
 
-
       <div class="page-header">
         <h1>Tables</h1>
       </div>
@@ -252,14 +250,12 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Thumbnails</h1>
       </div>
       <img data-src="holder.js/200x200" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
 
 
-
       <div class="page-header">
         <h1>Labels</h1>
       </div>
@@ -321,7 +317,6 @@
       </p>
 
 
-
       <div class="page-header">
         <h1>Badges</h1>
       </div>
@@ -350,7 +345,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Navs</h1>
       </div>
@@ -366,7 +360,6 @@
       </ul>
 
 
-
       <div class="page-header">
         <h1>Navbars</h1>
       </div>
@@ -438,7 +431,6 @@
       </nav>
 
 
-
       <div class="page-header">
         <h1>Alerts</h1>
       </div>
@@ -456,7 +448,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Progress bars</h1>
       </div>
@@ -485,7 +476,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>List groups</h1>
       </div>
@@ -529,7 +519,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Panels</h1>
       </div>
@@ -591,7 +580,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Wells</h1>
       </div>
@@ -600,7 +588,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Carousel</h1>
       </div>
diff --git a/less/_button-group.less b/less/_button-group.less
index 6092afcd6..fbcdf457b 100644
--- a/less/_button-group.less
+++ b/less/_button-group.less
@@ -198,7 +198,6 @@
 }
 
 
-
 // Justified button groups
 // ----------------------
 
diff --git a/less/theme.less b/less/theme.less
deleted file mode 100644
index ad341fe40..000000000
--- a/less/theme.less
+++ /dev/null
@@ -1,225 +0,0 @@
-
-//
-// Load core variables and mixins
-// --------------------------------------------------
-
-@import "variables.less";
-@import "mixins.less";
-
-
-
-//
-// Buttons
-// --------------------------------------------------
-
-// Common styles
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
-  .box-shadow(@shadow);
-
-  // Reset the shadow
-  &:active,
-  &.active {
-    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
-  }
-
-  .badge {
-    text-shadow: none;
-  }
-}
-
-// Mixin for generating new styles
-.btn-styles(@btn-color: #555) {
-  #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));
-  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
-  background-repeat: repeat-x;
-  border-color: darken(@btn-color, 14%);
-
-  &:hover,
-  &:focus  {
-    background-color: darken(@btn-color, 12%);
-    background-position: 0 -15px;
-  }
-
-  &:active,
-  &.active {
-    background-color: darken(@btn-color, 12%);
-    border-color: darken(@btn-color, 14%);
-  }
-
-  &:disabled,
-  &[disabled] {
-    background-color: darken(@btn-color, 12%);
-    background-image: none;
-  }
-}
-
-// Common styles
-.btn {
-  // Remove the gradient for the pressed/active state
-  &:active,
-  &.active {
-    background-image: none;
-  }
-}
-
-// Apply the mixin to the buttons
-.btn-primary   { .btn-styles(@btn-primary-bg); }
-.btn-secondary { .btn-styles(@btn-secondary-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
-.btn-info      { .btn-styles(@btn-info-bg); }
-.btn-success   { .btn-styles(@btn-success-bg); }
-.btn-warning   { .btn-styles(@btn-warning-bg); }
-.btn-danger    { .btn-styles(@btn-danger-bg); }
-
-
-
-//
-// Images
-// --------------------------------------------------
-
-.img-thumbnail {
-  .box-shadow(0 1px 2px rgba(0,0,0,.075));
-}
-
-
-
-//
-// Dropdowns
-// --------------------------------------------------
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
-  background-color: darken(@dropdown-link-hover-bg, 5%);
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
-  background-color: darken(@dropdown-link-active-bg, 5%);
-}
-
-
-
-//
-// Navbar
-// --------------------------------------------------
-
-// Default navbar
-.navbar-default {
-  #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
-  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
-  .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);
-
-  .navbar-nav > .open > a,
-  .navbar-nav > .active > a {
-    #gradient > .vertical(@start-color: darken(@navbar-default-link-active-bg, 5%); @end-color: darken(@navbar-default-link-active-bg, 2%));
-    .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
-  }
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255,255,255,.25);
-}
-
-// Inverted navbar
-.navbar-inverse {
-  #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
-  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
-
-  .navbar-nav > .open > a,
-  .navbar-nav > .active > a {
-    #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));
-    .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
-  }
-
-  .navbar-brand,
-  .navbar-nav > li > a {
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  }
-}
-
-// Undo rounded corners in static and fixed navbars
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  .border-radius(0);
-}
-
-
-
-//
-// Alerts
-// --------------------------------------------------
-
-// Common styles
-.alert {
-  text-shadow: 0 1px 0 rgba(255,255,255,.2);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
-}
-
-// Mixin for generating new styles
-.alert-styles(@color) {
-  #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 7.5%));
-  border-color: darken(@color, 15%);
-}
-
-// Apply the mixin to the alerts
-.alert-success    { .alert-styles(@alert-success-bg); }
-.alert-info       { .alert-styles(@alert-info-bg); }
-.alert-warning    { .alert-styles(@alert-warning-bg); }
-.alert-danger     { .alert-styles(@alert-danger-bg); }
-
-
-
-//
-// Progress bars
-// --------------------------------------------------
-
-// Give the progress background some depth
-.progress {
-  #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)
-}
-
-// Mixin for generating new styles
-.progress-bar-styles(@color) {
-  #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 10%));
-}
-
-// Apply the mixin to the progress bars
-.progress-bar            { .progress-bar-styles(@progress-bar-bg); }
-.progress-bar-success    { .progress-bar-styles(@progress-bar-success-bg); }
-.progress-bar-info       { .progress-bar-styles(@progress-bar-info-bg); }
-.progress-bar-warning    { .progress-bar-styles(@progress-bar-warning-bg); }
-.progress-bar-danger     { .progress-bar-styles(@progress-bar-danger-bg); }
-
-// Reset the striped class because our mixins don't do multiple gradients and
-// the above custom styles override the new `.progress-bar-striped` in v3.2.0.
-.progress-bar-striped {
-  #gradient > .striped();
-}
-
-
-//
-// List groups
-// --------------------------------------------------
-
-.list-group {
-  .border-radius(@border-radius-base);
-  .box-shadow(0 1px 2px rgba(0,0,0,.075));
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
-  #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
-  border-color: darken(@list-group-active-border, 7.5%);
-}