From 1e5ce1e1a9ff3959d9772777b0b1f45a9d972768 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sun, 18 Jan 2015 14:53:06 -0800
Subject: Temporarily revert "Rename scss/bootstrap.scss ->
 scss/_bootstrap.scss"

This reverts commit 2916ac43ed57baacc49d2cc7550b8d1dfe87b261.
This reverts commit 3d635f30795deb11ee7feaea5595b78c70221389.
This reverts commit 61a21205575aa03b4fbbacee2052d20bf75941d4.

This change broke the Grunt build.
---
 bower.json                       |  2 +-
 grunt/bs-sass-compile/libsass.js |  2 +-
 grunt/bs-sass-compile/sass.js    |  2 +-
 package.json                     |  2 +-
 scss/_bootstrap.scss             | 48 ----------------------------------------
 scss/bootstrap.scss              | 48 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 scss/_bootstrap.scss
 create mode 100644 scss/bootstrap.scss

diff --git a/bower.json b/bower.json
index 903c71d81..ef98190e6 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,7 @@
   ],
   "homepage": "http://getbootstrap.com",
   "main": [
-    "scss/_bootstrap.scss",
+    "scss/bootstrap.scss",
     "dist/css/bootstrap.css",
     "dist/js/bootstrap.js"
   ],
diff --git a/grunt/bs-sass-compile/libsass.js b/grunt/bs-sass-compile/libsass.js
index c69853603..e3d13a989 100644
--- a/grunt/bs-sass-compile/libsass.js
+++ b/grunt/bs-sass-compile/libsass.js
@@ -12,7 +12,7 @@ module.exports = function configureLibsass(grunt) {
       },
       core: {
         files: {
-          'dist/css/<%= pkg.name %>.css': 'scss/_<%= pkg.name %>.scss'
+          'dist/css/<%= pkg.name %>.css': 'scss/<%= pkg.name %>.scss'
         }
       },
       docs: {
diff --git a/grunt/bs-sass-compile/sass.js b/grunt/bs-sass-compile/sass.js
index ba6e6147a..d7743515d 100644
--- a/grunt/bs-sass-compile/sass.js
+++ b/grunt/bs-sass-compile/sass.js
@@ -15,7 +15,7 @@ module.exports = function configureRubySass(grunt) {
       core: {
         options: options,
         files: {
-          'dist/css/<%= pkg.name %>.css': 'scss/_<%= pkg.name %>.scss'
+          'dist/css/<%= pkg.name %>.css': 'scss/<%= pkg.name %>.scss'
         }
       },
       docs: {
diff --git a/package.json b/package.json
index b2b48efd2..c6295a079 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "test": "grunt test"
   },
   "style": "dist/css/bootstrap.css",
-  "sass": "scss/_bootstrap.scss",
+  "sass": "scss/bootstrap.scss",
   "main": "./dist/js/npm",
   "repository": {
     "type": "git",
diff --git a/scss/_bootstrap.scss b/scss/_bootstrap.scss
deleted file mode 100644
index b19aa2dda..000000000
--- a/scss/_bootstrap.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-// Core variables and mixins
-@import "variables";
-@import "mixins";
-
-// // Reset and dependencies
-@import "normalize";
-@import "print";
-
-// Core CSS
-@import "scaffolding";
-@import "type";
-@import "code";
-@import "grid";
-@import "tables";
-@import "forms";
-@import "buttons";
-
-// // Components
-@import "animation";
-@import "dropdown";
-@import "button-group";
-@import "input-group";
-@import "custom-forms";
-@import "nav";
-@import "navbar";
-@import "card";
-@import "breadcrumb";
-@import "pagination";
-@import "pager";
-@import "labels";
-@import "badge";
-@import "jumbotron";
-@import "alert";
-@import "progress";
-@import "media";
-@import "list-group";
-@import "responsive-embed";
-@import "close";
-
-// Components w/ JavaScript
-@import "modal";
-@import "tooltip";
-@import "popover";
-@import "carousel";
-
-// Utility classes
-@import "utilities";
-@import "utilities-responsive";
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
new file mode 100644
index 000000000..b19aa2dda
--- /dev/null
+++ b/scss/bootstrap.scss
@@ -0,0 +1,48 @@
+// Core variables and mixins
+@import "variables";
+@import "mixins";
+
+// // Reset and dependencies
+@import "normalize";
+@import "print";
+
+// Core CSS
+@import "scaffolding";
+@import "type";
+@import "code";
+@import "grid";
+@import "tables";
+@import "forms";
+@import "buttons";
+
+// // Components
+@import "animation";
+@import "dropdown";
+@import "button-group";
+@import "input-group";
+@import "custom-forms";
+@import "nav";
+@import "navbar";
+@import "card";
+@import "breadcrumb";
+@import "pagination";
+@import "pager";
+@import "labels";
+@import "badge";
+@import "jumbotron";
+@import "alert";
+@import "progress";
+@import "media";
+@import "list-group";
+@import "responsive-embed";
+@import "close";
+
+// Components w/ JavaScript
+@import "modal";
+@import "tooltip";
+@import "popover";
+@import "carousel";
+
+// Utility classes
+@import "utilities";
+@import "utilities-responsive";
-- 
cgit v1.2.3