Commit aae9c2d1 authored by Mark Otto's avatar Mark Otto

merge, compile

parent dbe95f02
{
"exclude": [
".git/**",
"node_modules/**"
],
"always-semicolon": true,
"block-indent": true,
"colon-space": true,
......@@ -13,11 +10,10 @@
"eof-newline": true,
"leading-zero": false,
"remove-empty-rulesets": true,
"rule-indent": true,
"stick-brace": "\n",
"strip-spaces": true,
"rule-indent": 2,
"unitless-zero": true,
"vendor-prefix-align": true,
"sort-order": [
[
"font",
......
......@@ -112,7 +112,8 @@ module.exports = function (grunt) {
},
minify: {
options: {
compress: true
compress: true,
report: 'min'
},
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
......@@ -124,13 +125,13 @@ module.exports = function (grunt) {
csscomb: {
sort: {
options: {
sortOrder: '.csscomb.json',
sortOrder: '.csscomb.json'
},
files: {
'dist/css/<%= pkg.name %>.sorted.css': ['dist/css/<%= pkg.name %>.css'],
'dist/css/<%= pkg.name %>.min.sorted.css': ['dist/css/<%= pkg.name %>.min.css'],
'dist/css/<%= pkg.name %>-theme.sorted.css': ['dist/css/<%= pkg.name %>-theme.css'],
'dist/css/<%= pkg.name %>-theme.min.sorted.css': ['dist/css/<%= pkg.name %>-theme.min.css']
'dist/css/<%= pkg.name %>.css': ['dist/css/<%= pkg.name %>.css'],
'dist/css/<%= pkg.name %>.min.css': ['dist/css/<%= pkg.name %>.min.css'],
'dist/css/<%= pkg.name %>-theme.css': ['dist/css/<%= pkg.name %>-theme.css'],
'dist/css/<%= pkg.name %>-theme.min.css': ['dist/css/<%= pkg.name %>-theme.min.css']
}
}
},
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment