Moved boostrap to its own subdirectory

The solution I used here is somewhat clever I think—all bootstrap files are now in their own /bootstrap subdirectory, which will prevent namespace conflicts and make customizations easier.

To import, we have a boostrap.scss and bootstrap-responsive.scss -- bootstrap-responsive.scss is no longer deprecated! No changes need to be made to import definitions from the previous version, and the name would even avoid namespace conflicts with files called 'responsive.css' in the root. In addition, upgrading will be a straight copy of the css/ directory from sass-twitter-bootstrap into our vendor/assets/stylesheets/bootstrap dir. Perfect on all fronts.

update-bootstrap.sh

@@ -5,7 +5,8 @@ TMP='tmp/sass-twitter-bootstrap'
 # Pull down sass-twitter-bootstrap sources
 git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap
 # Copy lib/ to stylesheets/
-cp -r $TMP/lib/* $ROOT/stylesheets
+mkdir -p $ROOT/stylesheets/bootstrap
+cp -r $TMP/lib/* $ROOT/stylesheets/bootstrap
 # Copy js/ to javascripts/
 cp -r $TMP/js/* $ROOT/javascripts
 # Copy img/ to images/
@@ -15,6 +16,6 @@ rm -r $ROOT/javascripts/tests
 rm -r $ROOT/stylesheets/tests
 
 # Patch the asset-url in _variables.scss
-patch -f vendor/assets/stylesheets/_variables.scss < asseturl.patch
+patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch
 
 rm -rf $TMP

vendor/assets/stylesheets/_bootstrap-responsive.scss

@@ -1,4 +0,0 @@
-// NOTE: This file is retained for compatibility with bootstrap-sass
-// versions prior to 2.2. You should include 'responsive' instead.
-@warn "bootstrap-responsive is deprecated - you should import 'responsive' instead.";
-@import "responsive";

vendor/assets/stylesheets/bootstrap-responsive.scss

@@ -0,0 +1 @@
+@import "bootstrap/responsive";

vendor/assets/stylesheets/bootstrap.scss

@@ -1,63 +1 @@
-/*!
- * Bootstrap v2.2.1
- *
- * 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.
- */
-
-// Core variables and mixins
-@import "variables"; // Modify this for custom colors, font-sizes, etc
-@import "mixins";
-
-// CSS Reset
-@import "reset";
-
-// Grid system and page structure
-@import "scaffolding";
-@import "grid";
-@import "layouts";
-
-// Base CSS
-@import "type";
-@import "code";
-@import "forms";
-@import "tables";
-
-// Components: common
-@import "sprites";
-@import "dropdowns";
-@import "wells";
-@import "component-animations";
-@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
-
-// Components: Nav
-@import "navs";
-@import "navbar";
-@import "breadcrumbs";
-@import "pagination";
-@import "pager";
-
-// Components: Popovers
-@import "modals";
-@import "tooltip";
-@import "popovers";
-
-// Components: Misc
-@import "thumbnails";
-@import "media";
-@import "labels-badges";
-@import "progress-bars";
-@import "accordion";
-@import "carousel";
-@import "hero-unit";
-
-// Utility classes
-@import "utilities"; // Has to be last to override when necessary
+@import "bootstrap/bootstrap";

vendor/assets/stylesheets/bootstrap/bootstrap.scss

@@ -0,0 +1,63 @@
+/*!
+ * Bootstrap v2.2.1
+ *
+ * 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.
+ */
+
+// Core variables and mixins
+@import "variables"; // Modify this for custom colors, font-sizes, etc
+@import "mixins";
+
+// CSS Reset
+@import "reset";
+
+// Grid system and page structure
+@import "scaffolding";
+@import "grid";
+@import "layouts";
+
+// Base CSS
+@import "type";
+@import "code";
+@import "forms";
+@import "tables";
+
+// Components: common
+@import "sprites";
+@import "dropdowns";
+@import "wells";
+@import "component-animations";
+@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
+
+// Components: Nav
+@import "navs";
+@import "navbar";
+@import "breadcrumbs";
+@import "pagination";
+@import "pager";
+
+// Components: Popovers
+@import "modals";
+@import "tooltip";
+@import "popovers";
+
+// Components: Misc
+@import "thumbnails";
+@import "media";
+@import "labels-badges";
+@import "progress-bars";
+@import "accordion";
+@import "carousel";
+@import "hero-unit";
+
+// Utility classes
+@import "utilities"; // Has to be last to override when necessary