Merge branch 'release/v1.2.4'

This commit is contained in:
CJ Patoilo 2016-12-13 21:17:32 -03:00
commit 7830ade726
No known key found for this signature in database
GPG Key ID: BB04A2FB1C21BF9D
10 changed files with 39 additions and 27 deletions

View File

@ -1,10 +1,19 @@
environment:
nodejs_version: 7
platform:
- x86
- x64
matrix:
- nodejs_version: 7
- nodejs_version: 6
- nodejs_version: 5
- nodejs_version: 4
install:
- ps: Install-Product node $env:nodejs_version $env:platform
- npm install
test_script: npm test
- ps: Install-Product node $env:nodejs_version
- set CI=true
- npm i -g npm
- set PATH=%APPDATA%\npm;%PATH%
- npm i
matrix:
fast_finish: true
build: off
version: '{build}'
shallow_clone: true
clone_depth: 1
test_script: npm t

View File

@ -1,4 +1,3 @@
# http://editorconfig.org/
root = true
[*]

View File

@ -1,4 +1,8 @@
sudo: false
language: node_js
node_js: 7
scripts: npm test
node_js:
- 7
- 6
- 5
- 4
before_install:
- npm i -g npm

View File

@ -1,6 +1,6 @@
{
"name": "milligram",
"version": "1.2.3",
"version": "1.2.4",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"repository": "milligram/milligram",

View File

@ -1,6 +1,6 @@
{
"name": "milligram/milligram",
"version": "1.2.3",
"version": "1.2.4",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"repository": "milligram/milligram",

2
dist/milligram.css vendored
View File

@ -1,5 +1,5 @@
/*!
* Milligram v1.2.3
* Milligram v1.2.4
* http://milligram.github.io
*
* Copyright (c) 2016 CJ Patoilo

View File

@ -1,5 +1,5 @@
/*!
* Milligram v1.2.3
* Milligram v1.2.4
* http://milligram.github.io
*
* Copyright (c) 2016 CJ Patoilo

View File

@ -1,6 +1,6 @@
Package.describe({
name: 'milligram:milligram',
version: '1.2.3',
version: '1.2.4',
summary: 'A minimalist CSS framework.',
git: 'https://github.com/milligram/milligram.git',
documentation: 'readme.md'

View File

@ -1,6 +1,6 @@
{
"name": "milligram",
"version": "1.2.3",
"version": "1.2.4",
"description": "A minimalist CSS framework.",
"homepage": "http://milligram.github.io",
"repository": "milligram/milligram",
@ -49,13 +49,13 @@
"normalize.css": "~5.0.0"
},
"devDependencies": {
"autoprefixer": "^6.5.3",
"autoprefixer": "^6.5.4",
"ava": "^0.17.0",
"backstopjs": "^2.3.3",
"banner-cli": "^0.6.0",
"browser-sync": "^2.18.2",
"husky": "^0.11.6",
"node-sass": "^3.13.0",
"backstopjs": "^2.3.5",
"banner-cli": "^0.9.2",
"browser-sync": "^2.18.5",
"husky": "^0.11.9",
"node-sass": "^3.13.1",
"npm-run-all": "^2.3.0",
"nyc": "^10.0.0",
"onchange": "^2.5.0",
@ -64,7 +64,7 @@
"sass-lint": "^1.10.2"
},
"engines": {
"node": "^7.0.0"
"node": ">=4"
},
"scripts": {
"start": "run-p build watch serve",
@ -81,7 +81,7 @@
"backstop": "run-s build && run-p serve compare",
"reference": "backstop reference --configPath=backstop.conf.js",
"compare": "backstop test --configPath=backstop.conf.js",
"precommit": "run-s build test && git add dist/*",
"precommit": "run-s build test",
"prestart": "npm install",
"pretest": "npm install"
}

View File

@ -5,9 +5,9 @@
[![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/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)
[![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://david-dm.org/milligram/milligram)
[![Version Status](https://badge.fury.io/js/milligram.svg)](https://www.npmjs.com/package/milligram)
[![Download Status](https://img.shields.io/npm/dt/milligram.svg)](https://www.npmjs.com/package/milligram)
[![Gitter Chat](https://img.shields.io/badge/gitter-join_the_chat-4cc61e.svg)](https://gitter.im/milligram/milligram)