diff options
| author | Gleb Mazovetskiy <[email protected]> | 2015-01-15 21:20:40 +0000 |
|---|---|---|
| committer | Gleb Mazovetskiy <[email protected]> | 2015-01-15 21:20:40 +0000 |
| commit | 2916ac43ed57baacc49d2cc7550b8d1dfe87b261 (patch) | |
| tree | c6a0dd3d4f97b88762b9d3d624f8459b7825e792 | |
| parent | 0531d6476cc655fe7fce56356067512b75ce7a15 (diff) | |
| download | bootstrap-2916ac43ed57baacc49d2cc7550b8d1dfe87b261.tar.xz bootstrap-2916ac43ed57baacc49d2cc7550b8d1dfe87b261.zip | |
Rename scss/bootstrap.scss -> scss/_bootstrap.scss
This is required for Compass compatibility. See
https://github.com/twbs/bootstrap-sass/issues/694
Also updates bower.json and package.json references to the main Sass
file.
| -rw-r--r-- | bower.json | 4 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | scss/_bootstrap.scss (renamed from scss/bootstrap.scss) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bower.json b/bower.json index be12ddb1d..6853bea14 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,7 @@ "keywords": [ "css", "js", - "less", + "sass", "mobile-first", "responsive", "front-end", @@ -14,7 +14,7 @@ ], "homepage": "http://getbootstrap.com", "main": [ - "less/bootstrap.less", + "sass/_bootstrap.scss", "dist/css/bootstrap.css", "dist/js/bootstrap.js" ], diff --git a/package.json b/package.json index fa2e1449d..2befe5f25 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "3.3.1", "keywords": [ "css", - "less", + "sass", "mobile-first", "responsive", "front-end", @@ -17,7 +17,7 @@ "test": "grunt test" }, "style": "dist/css/bootstrap.css", - "less": "less/bootstrap.less", + "sass": "_sass/bootstrap.sass", "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 |