aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 18:08:54 -0800
committerMark Otto <[email protected]>2016-02-06 18:08:54 -0800
commitf25f9bceb1924b54f5743a238ca04c162731136d (patch)
treec7d19e146b7bc0f1030838fbc0a51591d2f11472
parent697466badf54a454767f8cee520d71f55787ad87 (diff)
downloadbootstrap-f25f9bceb1924b54f5743a238ca04c162731136d.tar.xz
bootstrap-f25f9bceb1924b54f5743a238ca04c162731136d.zip
Remove csscomb (soon replace it with something else) because scsslint has most of it covered already
-rw-r--r--Gruntfile.js26
-rw-r--r--package.json1
2 files changed, 2 insertions, 25 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index ba9979896..6c663a8a5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -279,28 +279,6 @@ module.exports = function (grunt) {
}
},
- csscomb: {
- options: {
- config: 'scss/.csscomb.json'
- },
- dist: {
- expand: true,
- cwd: 'dist/css/',
- src: ['*.css', '!*.min.css'],
- dest: 'dist/css/'
- },
- examples: {
- expand: true,
- cwd: 'docs/examples/',
- src: '**/*.css',
- dest: 'docs/examples/'
- },
- docs: {
- src: 'docs/assets/css/src/docs.css',
- dest: 'docs/assets/css/src/docs.css'
- }
- },
-
copy: {
docs: {
expand: true,
@@ -484,7 +462,7 @@ module.exports = function (grunt) {
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);
- grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
+ grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'cssmin:core', 'cssmin:docs']);
// Full distribution task.
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
@@ -503,7 +481,7 @@ module.exports = function (grunt) {
});
// Docs task.
- grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
+ grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'cssmin:docs']);
grunt.registerTask('lint-docs-css', ['scsslint:docs']);
grunt.registerTask('docs-js', ['uglify:docsJs']);
grunt.registerTask('lint-docs-js', ['jscs:assets']);
diff --git a/package.json b/package.json
index 0f65326b1..b2494c6e2 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
"grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "~0.11.0",
"grunt-contrib-watch": "~0.6.1",
- "grunt-csscomb": "~3.1.0",
"grunt-eslint": "^17.1.0",
"grunt-exec": "~0.4.6",
"grunt-html": "~5.0.0",