Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 16 insertions, 21 deletions

diff --git a/less/bootstrap.less b/less/bootstrap.less
index accfb92e4..635e0256c 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -21,43 +21,38 @@
 @import "type.less";
 @import "code.less";
 @import "grid.less";
-
 @import "tables.less";
 @import "forms.less";
 @import "buttons.less";
 
-// Components: common
+// Components
 @import "component-animations.less";
-@import "input-groups.less";
 @import "dropdowns.less";
-@import "list-group.less";
-@import "panels.less";
-@import "wells.less";
-@import "close.less";
-
-// Components: Nav
+@import "button-groups.less";
+@import "input-groups.less";
 @import "navs.less";
 @import "navbar.less";
-@import "button-groups.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
 @import "pager.less";
+@import "labels.less";
+@import "badges.less";
+@import "jumbotron.less";
+@import "thumbnails.less";
+@import "alerts.less";
+@import "progress-bars.less";
+@import "media.less";
+@import "list-group.less";
+@import "panels.less";
+@import "wells.less";
+@import "close.less";
 
-// Components: Popovers
+// Components w/ JavaScript
 @import "modals.less";
 @import "tooltip.less";
 @import "popovers.less";
-
-// Components: Misc
-@import "alerts.less";
-@import "thumbnails.less";
-@import "media.less";
-@import "labels.less";
-@import "badges.less";
-@import "progress-bars.less";
 @import "carousel.less";
-@import "jumbotron.less";
 
 // Utility classes
-@import "utilities.less"; // Has to be last to override when necessary
+@import "utilities.less";
 @import "responsive-utilities.less";