mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'v4' into v4_builds

Browse Source
This commit is contained in:
Mark Otto
2015-06-19 16:26:33 -07:00
parent 8410afe0e1 3df2d085ed
commit bc29c016b7
131 changed files with 3875 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+6 -6
View File
@@ -205,11 +205,11 @@ module.exports = function (grunt) {
// CSS build configuration
scsslint: {
scss: ['scss/*.scss', '!scss/_normalize.scss'],
options: {
config: 'scss/.scss-lint.yml',
reporterOutput: 'scss-lint-report.xml'
}
config: 'scss/.scsslint.yml',
reporterOutput: null
},
src: ['scss/*.scss', '!scss/_normalize.scss']
},
postcss: {
@@ -460,7 +460,7 @@ module.exports = function (grunt) {
// JS distribution task.
grunt.registerTask('dist-js', ['concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
grunt.registerTask('test-scss', ['scsslint:scss']);
grunt.registerTask('test-scss', ['scsslint']);
// CSS distribution task.
// Supported Compilers: sass (Ruby) and libsass.
@@ -498,7 +498,7 @@ module.exports = function (grunt) {
grunt.registerTask('lint-docs-js', ['jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);
grunt.registerTask('docs-github', ['jekyll:github']);
grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']);
// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.