diff options
| author | Chris Rebert <[email protected]> | 2015-01-18 15:08:12 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-18 15:08:12 -0800 |
| commit | 1236e7a9961bd45f7470b30fc278562670a9f582 (patch) | |
| tree | 5cffab45e87a2d20e4afa9471f6b1840ec404686 | |
| parent | 61a21205575aa03b4fbbacee2052d20bf75941d4 (diff) | |
| parent | 1e5ce1e1a9ff3959d9772777b0b1f45a9d972768 (diff) | |
| download | bootstrap-1236e7a9961bd45f7470b30fc278562670a9f582.tar.xz bootstrap-1236e7a9961bd45f7470b30fc278562670a9f582.zip | |
Merge pull request #64 from twbs/fix-build
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | grunt/bs-sass-compile/libsass.js | 2 | ||||
| -rw-r--r-- | grunt/bs-sass-compile/sass.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | scss/bootstrap.scss (renamed from scss/_bootstrap.scss) | 0 |
5 files changed, 4 insertions, 4 deletions
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 index b19aa2dda..b19aa2dda 100644 --- a/scss/_bootstrap.scss +++ b/scss/bootstrap.scss |