rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"

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

This change broke the Grunt build.
This commit is contained in:
Chris Rebert 2015-01-18 14:53:06 -08:00
parent 61a2120557
commit 1e5ce1e1a9
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -14,7 +14,7 @@
], ],
"homepage": "http://getbootstrap.com", "homepage": "http://getbootstrap.com",
"main": [ "main": [
"scss/_bootstrap.scss", "scss/bootstrap.scss",
"dist/css/bootstrap.css", "dist/css/bootstrap.css",
"dist/js/bootstrap.js" "dist/js/bootstrap.js"
], ],

2
grunt/bs-sass-compile/libsass.js
View File

@ -12,7 +12,7 @@ module.exports = function configureLibsass(grunt) {
}, },
core: { core: {
files: { files: {
'dist/css/<%= pkg.name %>.css': 'scss/_<%= pkg.name %>.scss' 'dist/css/<%= pkg.name %>.css': 'scss/<%= pkg.name %>.scss'
} }
}, },
docs: { docs: {

2
grunt/bs-sass-compile/sass.js
View File

@ -15,7 +15,7 @@ module.exports = function configureRubySass(grunt) {
core: { core: {
options: options, options: options,
files: { files: {
'dist/css/<%= pkg.name %>.css': 'scss/_<%= pkg.name %>.scss' 'dist/css/<%= pkg.name %>.css': 'scss/<%= pkg.name %>.scss'
} }
}, },
docs: { docs: {

2
package.json
View File

@ -17,7 +17,7 @@
"test": "grunt test" "test": "grunt test"
}, },
"style": "dist/css/bootstrap.css", "style": "dist/css/bootstrap.css",
"sass": "scss/_bootstrap.scss", "sass": "scss/bootstrap.scss",
"main": "./dist/js/npm", "main": "./dist/js/npm",
"repository": { "repository": {
"type": "git", "type": "git",

0
scss/_bootstrap.scss → scss/bootstrap.scss vendored
View File