vendor/assets/stylesheets/twitter/bootstrap.scss in sass-twitter-bootstrap-2.0.1 vs vendor/assets/stylesheets/twitter/bootstrap.scss in sass-twitter-bootstrap-2.1.1

- old
+ new

@@ -1,17 +1,13 @@ /*! - * Bootstrap v2.0.1 + * Bootstrap v2.1.0 * * 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 @johnwlong / @m5o. - * - * Date: @DATE */ // Core variables and mixins @import "variables"; // Modify this for custom colors, font-sizes, etc @import "mixins"; @@ -38,11 +34,11 @@ @import "close"; // Components: Buttons & Alerts @import "buttons"; @import "button-groups"; -@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.scss +@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons // Components: Nav @import "navs"; @import "navbar"; @import "breadcrumbs"; @@ -54,10 +50,10 @@ @import "tooltip"; @import "popovers"; // Components: Misc @import "thumbnails"; -@import "labels"; +@import "labels-badges"; @import "progress-bars"; @import "accordion"; @import "carousel"; @import "hero-unit";