AverageMarcus/milligram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://github.com/willianjusten/milligram into willianjusten-master

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
CJ Patoilo 2016-12-08 21:04:00 -03:00
commit be496c3875
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bower.json
View File

@ -29,7 +29,6 @@
],
"ignore": [
".appveyor.yml",
".coveralls.yml",
".editorconfig",
".eslintrc",
".github",

1
composer.json
View File

@ -29,7 +29,6 @@
],
"ignore": [
".appveyor.yml",
".coveralls.yml",
".editorconfig",
".eslintrc",
".github",

31
package.json
View File

@ -29,7 +29,6 @@
],
"ignore": [
".appveyor.yml",
".coveralls.yml",
".editorconfig",
".eslintrc",
".github",
@ -55,33 +54,35 @@
"backstopjs": "^2.3.3",
"banner-cli": "^0.6.0",
"browser-sync": "^2.18.2",
"coveralls": "^2.11.15",
"husky": "^0.11.6",
"node-sass": "^3.13.0",
"npm-run-all": "^2.3.0",
"nyc": "^10.0.0",
"onchange": "^2.5.0",
"postcss-cli": "^2.6.0",
"rimraf": "^2.5.4",
"sass-lint": "^1.10.2"
},
"engines": {
"node": "^7.0.0"
},
"scripts": {
"prestart": "npm install",
"pretest": "npm install",
"banner": "banner-cli dist/*.css",
"clean": "rm -rf dist",
"autoprefixer": "postcss -u autoprefixer --no-map.inline --autoprefixer.browsers \"last 1 versions\" -r dist/*.css",
"sass": "node-sass --output-style expanded src/milligram.sass dist/milligram.css && node-sass --output-style compressed src/milligram.sass dist/milligram.min.css",
"lint": "sass-lint -c .sasslintrc \"src/*.sass\" --verbose --no-exit",
"build": "run-s clean lint sass autoprefixer banner",
"watch": "onchange src -- npm run build",
"serve": "browser-sync start --no-notify -s test --ss dist -f dist",
"start": "run-p build watch serve",
"test": "nyc ava",
"coveralls": "nyc report --reporter=text-lcov | coveralls",
"build": "run-s clean sass autoprefixer banner",
"clean": "rimraf dist",
"sass": "node-sass --output-style expanded src/milligram.sass dist/milligram.css && node-sass --output-style compressed src/milligram.sass dist/milligram.min.css",
"autoprefixer": "postcss -u autoprefixer --no-map.inline --autoprefixer.browsers \"last 1 versions\" -r dist/*.css",
"banner": "banner-cli dist/*.css",
"watch": "onchange src -- run-s build",
"serve": "browser-sync start --no-notify -s test --ss dist -f dist",
"test": "run-s lint ava",
"lint": "sass-lint -c .sasslintrc \"src/*.sass\" --verbose --no-exit",
"ava": "nyc ava",
"backstop": "run-s build && run-p serve compare",
"reference": "backstop reference --configPath=backstop.conf.js",
"compare": "backstop test --configPath=backstop.conf.js",
"backstop": "run-s build && run-p serve compare"
"precommit": "run-s build test && git add dist/*",
"prestart": "npm install",
"pretest": "npm install"
}
}

2
readme.md
View File

@ -3,7 +3,7 @@
> A minimalist CSS framework.
[![Travis Status](https://travis-ci.org/milligram/milligram.svg?branch=master)](https://travis-ci.org/milligram/milligram?branch=master)
[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/wabkk000uh6d97xk?svg=true)](https://ci.appveyor.com/project/cjpatoilo/milligram)
[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/xcm8meymwerq0r82?svg=true)](https://ci.appveyor.com/project/cjpatoilo/milligram)
[![Codacy Status](https://img.shields.io/codacy/grade/848fb4bd6902434fab0bcfb5461284fe/master.svg)](https://www.codacy.com/app/milligram/milligram/dashboard)
[![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://travis-ci.org/milligram/milligram?branch=master)
[![Download Status](https://img.shields.io/npm/dt/milligram.svg)](https://www.npmjs.com/package/milligram)