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.

diff --git a/bower.json b/bower.json
index 903c71d81b33712bd98494f8b3aa1575f319d1c5..ef98190e6a42fef971e9edbd2f43045ff31d8c8d 100644 (file)
--- 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 c6985360364feb076d10c1a5605cdb3403678ec8..e3d13a989ffc243134c69f1a2c390653c0751344 100644 (file)
--- 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 ba6e6147a444fb7d0a0bec0e1aa2381e4ea58436..d7743515d80fd3aaf775611d2e6ccd9828bdfc5f 100644 (file)
--- 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 b2b48efd2ee89fe34f9f1e3935bb8f2dc767affe..c6295a07975fcaada96e7f331f90bb371c934da2 100644 (file)
--- 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
similarity index 100%
rename from scss/_bootstrap.scss
rename to scss/bootstrap.scss