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

Merge branch 'release/v.1.3.0-rc2'

Browse Source
This commit is contained in:
CJ Patoilo 2016-11-22 20:34:06 -03:00
commit 61ccc63243
21 changed files with 6 additions and 6 deletions

4
backstop.conf.js

@ -104,7 +104,7 @@ module.exports = {
onBeforeScript: null onBeforeScript: null
}], }],
paths: { paths: {
bitmaps_reference: 'test/reference', bitmaps_reference: 'test/regression',
bitmaps_test: 'node_modules/backstopjs/.tmp/bitmaps_test', bitmaps_test: 'node_modules/backstopjs/.tmp/bitmaps_test',
casper_scripts: 'node_modules/backstopjs/.tmp/casper_scripts', casper_scripts: 'node_modules/backstopjs/.tmp/casper_scripts',
html_report: 'node_modules/backstopjs/.tmp/html_report', html_report: 'node_modules/backstopjs/.tmp/html_report',
@ -115,4 +115,4 @@ module.exports = {
casperFlags: [], casperFlags: [],
debug: false, debug: false,
port: 3002 port: 3002
} };

4
readme.md

@ -4,10 +4,10 @@
[![Travis Status](https://travis-ci.org/milligram/milligram.svg?branch=master)](https://travis-ci.org/milligram/milligram?branch=master) [![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/wabkk000uh6d97xk?svg=true)](https://ci.appveyor.com/project/cjpatoilo/milligram)
[![Version Status](https://badge.fury.io/js/milligram.svg)](https://www.npmjs.com/package/milligram)
[![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://travis-ci.org/milligram/milligram?branch=master)
[![Codacy Status](https://img.shields.io/codacy/grade/848fb4bd6902434fab0bcfb5461284fe/master.svg)](https://www.codacy.com/app/cjpatoilo/milligram/dashboard) [![Codacy Status](https://img.shields.io/codacy/grade/848fb4bd6902434fab0bcfb5461284fe/master.svg)](https://www.codacy.com/app/cjpatoilo/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) [![Download Status](https://img.shields.io/npm/dt/milligram.svg)](https://www.npmjs.com/package/milligram)
[![Version Status](https://badge.fury.io/js/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) [![Gitter Chat](https://img.shields.io/badge/gitter-join_the_chat-4cc61e.svg)](https://gitter.im/milligram/milligram)

0
test/reference/486021560_Blockquotes_0_blockquotes_0_phone.png → test/regression/486021560_Blockquotes_0_blockquotes_0_phone.png

Side by Side Swipe

Before

(image error) Size: 13 KiB

After

(image error) Size: 13 KiB

0
test/reference/486021560_Blockquotes_0_blockquotes_1_laptop.png → test/regression/486021560_Blockquotes_0_blockquotes_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 16 KiB

After

(image error) Size: 16 KiB

0
test/reference/486021560_Buttons_0_buttons_0_phone.png → test/regression/486021560_Buttons_0_buttons_0_phone.png

Side by Side Swipe

Before

(image error) Size: 78 KiB

After

(image error) Size: 78 KiB

0
test/reference/486021560_Buttons_0_buttons_1_laptop.png → test/regression/486021560_Buttons_0_buttons_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 68 KiB

After

(image error) Size: 68 KiB

0
test/reference/486021560_Codes_0_codes_0_phone.png → test/regression/486021560_Codes_0_codes_0_phone.png

Side by Side Swipe Overlay

Before

(image error) Size: 7.3 KiB

After

(image error) Size: 7.3 KiB

0
test/reference/486021560_Codes_0_codes_1_laptop.png → test/regression/486021560_Codes_0_codes_1_laptop.png

Side by Side Swipe Overlay

Before

(image error) Size: 9.2 KiB

After

(image error) Size: 9.2 KiB

0
test/reference/486021560_Forms_0_forms_0_phone.png → test/regression/486021560_Forms_0_forms_0_phone.png

Side by Side Swipe

Before

(image error) Size: 63 KiB

After

(image error) Size: 63 KiB

0
test/reference/486021560_Forms_0_forms_1_laptop.png → test/regression/486021560_Forms_0_forms_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 69 KiB

After

(image error) Size: 69 KiB

0
test/reference/486021560_Grids_0_grids_0_phone.png → test/regression/486021560_Grids_0_grids_0_phone.png

Side by Side Swipe Overlay

Before

(image error) Size: 127 KiB

After

(image error) Size: 127 KiB

0
test/reference/486021560_Grids_0_grids_1_laptop.png → test/regression/486021560_Grids_0_grids_1_laptop.png

Side by Side Swipe Overlay

Before

(image error) Size: 147 KiB

After

(image error) Size: 147 KiB

0
test/reference/486021560_Lists_0_lists_0_phone.png → test/regression/486021560_Lists_0_lists_0_phone.png

Side by Side Swipe

Before

(image error) Size: 84 KiB

After

(image error) Size: 84 KiB

0
test/reference/486021560_Lists_0_lists_1_laptop.png → test/regression/486021560_Lists_0_lists_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 90 KiB

After

(image error) Size: 90 KiB

0
test/reference/486021560_Tables_0_tables_0_phone.png → test/regression/486021560_Tables_0_tables_0_phone.png

Side by Side Swipe

Before

(image error) Size: 47 KiB

After

(image error) Size: 47 KiB

0
test/reference/486021560_Tables_0_tables_1_laptop.png → test/regression/486021560_Tables_0_tables_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 52 KiB

After

(image error) Size: 52 KiB

0
test/reference/486021560_Typography_0_typography_0_phone.png → test/regression/486021560_Typography_0_typography_0_phone.png

Side by Side Swipe

Before

(image error) Size: 89 KiB

After

(image error) Size: 89 KiB

0
test/reference/486021560_Typography_0_typography_1_laptop.png → test/regression/486021560_Typography_0_typography_1_laptop.png

Side by Side Swipe

Before

(image error) Size: 95 KiB

After

(image error) Size: 95 KiB

0
test/reference/486021560_Utilities_0_utilities_0_phone.png → test/regression/486021560_Utilities_0_utilities_0_phone.png

Side by Side Swipe Overlay

Before

(image error) Size: 6.5 KiB

After

(image error) Size: 6.5 KiB

0
test/reference/486021560_Utilities_0_utilities_1_laptop.png → test/regression/486021560_Utilities_0_utilities_1_laptop.png

Side by Side Swipe Overlay

Before

(image error) Size: 7.0 KiB

After

(image error) Size: 7.0 KiB

4
test/unit/package-spec.js

@ -112,7 +112,7 @@ describe('Package', () => {
describe('Ignore', () => { describe('Ignore', () => {
it(`should be equal`, () => { it('should be equal', () => {
packages.map((referenceValue, referenceIndex) => { packages.map((referenceValue, referenceIndex) => {
packages.map((compareValue, compareIndex) => { packages.map((compareValue, compareIndex) => {
if (referenceIndex !== compareIndex) assert(referenceValue.ignore, compareValue.ignore); if (referenceIndex !== compareIndex) assert(referenceValue.ignore, compareValue.ignore);
@ -124,7 +124,7 @@ describe('Package', () => {
describe('Keywords', () => { describe('Keywords', () => {
it(`should be equal`, () => { it('should be equal', () => {
packages.map((referenceValue, referenceIndex) => { packages.map((referenceValue, referenceIndex) => {
packages.map((compareValue, compareIndex) => { packages.map((compareValue, compareIndex) => {
if (referenceIndex !== compareIndex) assert(referenceValue.keywords, compareValue.keywords); if (referenceIndex !== compareIndex) assert(referenceValue.keywords, compareValue.keywords);