Merge branch 'release/v1.2.0-rc7'

dist/milligram.css

@@ -193,8 +193,7 @@ pre > code {
 hr {
   border: 0;
   border-top: 0.1rem solid #f4f5f6;
-  margin-bottom: 3.5rem;
+  margin: 3.0rem 0;
-  margin-top: 3.0rem;
 }
 
 input[type='email'],

package.json

@@ -64,10 +64,12 @@
 		"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": "npm-run-all sass autoprefixer banner",
+		"build": "run-s lint sass autoprefixer banner",
 		"watch": "onchange src -- npm run build",
 		"serve": "browser-sync start -s test --ss dist -f dist",
-		"start": "npm-run-all -p watch serve",
+		"start": "run-p watch serve",
-		"test": "cd node_modules/backstopjs && npm run test -- --configPath=../../test/visual/backstop.config.js && cd ../../"
+		"reference": "cd node_modules/backstopjs && npm run reference -- --configPath=../../test/visual/backstop.config.js && cd ../../",
+		"compare": "cd node_modules/backstopjs && npm run test -- --configPath=../../test/visual/backstop.config.js && cd ../../",
+		"test": "run-p serve compare"
 	}
 }

src/_Divider.sass

@@ -5,5 +5,4 @@
 hr
 	border: 0
 	border-top: .1rem solid $color-tertiary
-	margin-bottom: 3.5rem
+	margin: 3.0rem 0
-	margin-top: 3.0rem

test/index.html

@@ -22,6 +22,7 @@
 
 			<section class="container" id="typography">
 				<h5 class="title">Typography</h5>
+				<hr>
 				<div class="example">
 					<div class="row">
 						<div class="column">
@@ -43,6 +44,7 @@
 
 			<section class="container" id="blockquotes">
 				<h5 class="title">Blockquotes</h5>
+				<hr>
 				<div class="example">
 					<div class="row">
 						<div class="column">
@@ -59,6 +61,7 @@
 
 			<section class="container" id="buttons">
 				<h5 class="title">Buttons</h5>
+				<hr>
 				<div class="example">
 					<div class="row">
 						<div class="column">
@@ -117,6 +120,7 @@
 
 			<section class="container" id="lists">
 				<h5 class="title">Lists</h5>
+				<hr>
 				<div class="example">
 					<div class="row">
 						<div class="column">
@@ -167,6 +171,7 @@
 
 			<section class="container" id="forms">
 				<h5 class="title">Forms</h5>
+				<hr>
 				<div class="example">
 				<form>
 						<fieldset>
@@ -231,6 +236,7 @@
 
 			<section class="container" id="tables">
 				<h5 class="title">Tables</h5>
+				<hr>
 				<div class="example">
 					<table>
 						<thead>
@@ -291,6 +297,7 @@
 
 			<section class="container" id="grids">
 				<h5 class="title">Grids</h5>
+				<hr>
 				<div class="example">
 					<div class="row">
 						<div class="column"><span class="column-demo">100%</span></div>
@@ -531,6 +538,7 @@
 
 			<section class="container" id="codes">
 				<h5 class="title">Codes</h5>
+				<hr>
 				<div class="example">
 <pre><code>.milligram {
   color: #9b4dca;
@@ -540,6 +548,7 @@
 
 			<section class="container" id="utilities">
 				<h5 class="title">Utilities</h5>
+				<hr>
 				<div class="example">
 					<div class="clearfix">
 						<img class="float-left" src="http://placehold.it/320/d1d1d1/?text=float+to+left" alt="float to left">
@@ -550,6 +559,7 @@
 
 			<section class="container" id="examples">
 				<h5 class="title">Examples</h5>
+				<hr>
 				<p>
 					<ul>
 						<li><a href="https://milligram.github.io/getting-started.html" title="Getting Started">Getting Started</a></li>

test/visual/backstop.config.js

@@ -1,114 +1,112 @@
 module.exports = {
 	viewports: [
 		{ name: 'phone', width: 320, height: 480 },
-		{ name: 'tablet', width: 768, height: 1024 },
+		{ name: 'laptop', width: 1280, height: 800 }
-		{ name: 'laptop', width: 1280, height: 800 },
-		{ name: 'desktop', width: 1920, height: 1080 }
 	],
 	scenarios: [{
-    label: 'Typography',
+		label: 'Typography',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#typography'],
+		selectors: ['#typography'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  },{
+	}, {
-    label: 'Blockquotes',
+		label: 'Blockquotes',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#blockquotes'],
+		selectors: ['#blockquotes'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Buttons',
+		label: 'Buttons',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#buttons'],
+		selectors: ['#buttons'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Lists',
+		label: 'Lists',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#lists'],
+		selectors: ['#lists'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Forms',
+		label: 'Forms',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#forms'],
+		selectors: ['#forms'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Tables',
+		label: 'Tables',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#tables'],
+		selectors: ['#tables'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Grids',
+		label: 'Grids',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#grids'],
+		selectors: ['#grids'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Codes',
+		label: 'Codes',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#codes'],
+		selectors: ['#codes'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }, {
+	}, {
-    label: 'Utilities',
+		label: 'Utilities',
-    url: 'http://localhost:3000',
+		url: 'http://localhost:3000',
-    hideSelectors: [],
+		hideSelectors: [],
-    removeSelectors: ['#__bs_notify__'],
+		removeSelectors: ['#__bs_notify__'],
-    selectors: ['#utilities'],
+		selectors: ['#utilities'],
-    readyEvent: null,
+		readyEvent: null,
-    delay: 500,
+		delay: 500,
-    misMatchThreshold: 0.1,
+		misMatchThreshold: 0.1,
-    onBeforeScript: 'onBefore.js',
+		onReadyScript: null,
-    onReadyScript: 'onReady.js'
+		onBeforeScript: null
-  }],
+	}],
 	paths: {
 		bitmaps_reference: '../../test/visual/reference',
 		bitmaps_test: '.tmp',
-		casper_scripts: '../../test/visual/fixtures',
+		casper_scripts: null,
 		compare_data: '.tmp/compare.json'
 	},
 	engine: 'phantomjs',

test/visual/fixtures/onBefore.js

@@ -1,4 +0,0 @@
-module.exports = function(casper, scenario, vp) {
-	casper.echo('onBeforeEach.js', 'INFO');
-	casper.wait(50);
-};

test/visual/fixtures/onReady.js

@@ -1,4 +0,0 @@
-module.exports = function(casper, scenario, vp) {
-	casper.echo('onReady.js', 'INFO');
-	casper.wait(50);
-};