vendor/assets/stylesheets/_bootstrap.scss in bootstrap-sass-2.0.2 vs vendor/assets/stylesheets/_bootstrap.scss in bootstrap-sass-2.0.3
- old
+ new
@@ -1,5 +1,15 @@
+//
+// Bootstrap v2.0.3
+//
+// Copyright 2012 Twitter, Inc
+// Licensed under the Apache License v2.0
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Designed and built with all the love in the world @twitter by @mdo and @fat.
+// Converted to Sass by @thomasmcdonald_, and distributed as bootstrap-sass
+
// Core variables and mixins
@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
@import "bootstrap/mixins";
// CSS Reset
@@ -40,11 +50,10 @@
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
// Components: Misc
@import "bootstrap/thumbnails";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
+@import "bootstrap/labels-badges";
@import "bootstrap/progress-bars";
@import "bootstrap/accordion";
@import "bootstrap/carousel";
@import "bootstrap/hero-unit";
\ No newline at end of file