Merge branch 'release/v1.2.0'

milligram · Nov 14, 2016 · 18ff0bd · 18ff0bd
2 parents 99a9f2a + 74f32e6
commit 18ff0bd
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 72 deletions.
diff --git a/.npmignore b/.npmignore
@@ -2,8 +2,9 @@
 .github
 .gitignore
 .npmignore
+.sasslintrc
 .travis.yml
-.versions
+backstop.conf.js
 bower.json
 changelog.md
 component.json

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,4 @@
 sudo: false
 language: node_js
-node_js:
-  - 6
-before_install:
-  - node --version
-  - npm --version
+node_js: 6
+scripts: npm test
diff --git a/.versions b/.versions
diff --git a/test/visual/backstop.config.js → backstop.conf.js b/test/visual/backstop.config.js → backstop.conf.js
@@ -104,13 +104,14 @@ module.exports = {
 		onBeforeScript: null
 	}],
 	paths: {
-		bitmaps_reference: '../../test/visual/reference',
-		bitmaps_test: '.tmp',
-		casper_scripts: null,
-		compare_data: '.tmp/compare.json'
+		bitmaps_reference: 'test/reference',
+		bitmaps_test: 'node_modules/backstopjs/.tmp/bitmaps_test',
+		casper_scripts: 'node_modules/backstopjs/.tmp/casper_scripts',
+		html_report: 'node_modules/backstopjs/.tmp/html_report',
+		ci_report: 'node_modules/backstopjs/.tmp/ci_report'
 	},
 	engine: 'phantomjs',
-	report: ['browser', 'CLI'],
+	report: ['browser', 'CLI', 'CI'],
 	casperFlags: [],
 	debug: false,
 	port: 3002

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -32,8 +32,9 @@
 		".github",
 		".gitignore",
 		".npmignore",
+		".sasslintrc",
 		".travis.yml",
-		".versions",
+		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
 		"component.json",

diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -32,8 +32,9 @@
 		".github",
 		".gitignore",
 		".npmignore",
+		".sasslintrc",
 		".travis.yml",
-		".versions",
+		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
 		"component.json",
@@ -43,7 +44,6 @@
 		"src",
 		"test"
 	],
-	"repo": "milligram/milligram",
 	"styles": [
 		"examples",
 		"dist/milligram.css",

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram/milligram",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -32,13 +32,13 @@
 		".github",
 		".gitignore",
 		".npmignore",
+		".sasslintrc",
 		".travis.yml",
-		".versions",
+		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
 		"component.json",
 		"composer.json",
-		"contributing.md",
 		"package.js",
 		"package.json",
 		"src",

diff --git a/dist/milligram.css b/dist/milligram.css
diff --git a/dist/milligram.css.map b/dist/milligram.css.map
diff --git a/dist/milligram.min.css b/dist/milligram.min.css
diff --git a/dist/milligram.min.css.map b/dist/milligram.min.css.map
diff --git a/examples/index.html b/examples/index.html
@@ -6,11 +6,11 @@
 		<meta name="author" content="CJ Patoilo">
 		<meta name="description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code.">
 		<title>Milligram | A minimalist CSS framework.</title>
-		<link rel="icon" href="https://milligram.github.io/img/favicon.ico">
+		<link rel="icon" href="https://milligram.github.io/images/favicon.ico">
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.css">
 		<link rel="stylesheet" href="../dist/milligram.min.css">
-		<link rel="stylesheet" href="https://milligram.github.io/css/style.css">
+		<link rel="stylesheet" href="https://milligram.github.io/styles/main.min.css">
 	</head>
 	<body>
 
@@ -20,7 +20,7 @@
 				<section class="container">
 
 					<a class="navigation-title" href="https://milligram.github.io/">
-						<img class="img" src="https://milligram.github.io/img/logo.svg" height="30" alt="Milligram" title="Milligram">
+						<img class="img" src="https://milligram.github.io/images/logo.svg" height="30" alt="Milligram" title="Milligram">
 						<h1 class="title">Milligram</h1>
 					</a>
 
@@ -102,7 +102,7 @@ <h5 class="title">Contributing</h5>
 
 		</main>
 
-		<script src="https://milligram.github.io/js/script.js"></script>
+		<script src="https://milligram.github.io/scripts/main.min.js"></script>
 
 	</body>
 </html>
diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
 	name: 'milligram:milligram',
-	version: '1.1.0',
+	version: '1.2.0',
 	summary: 'A minimalist CSS framework.',
 	git: 'https://github.com/milligram/milligram.git',
 	documentation: 'readme.md'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -32,8 +32,9 @@
 		".github",
 		".gitignore",
 		".npmignore",
+		".sasslintrc",
 		".travis.yml",
-		".versions",
+		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
 		"component.json",
@@ -48,7 +49,7 @@
 	},
 	"devDependencies": {
 		"autoprefixer": "^6.3.6",
-		"backstopjs": "^1.3.5",
+		"backstopjs": "^2.0.6",
 		"browser-sync": "^2.13.0",
 		"node-sass": "^3.7.0",
 		"npm-run-all": "^2.1.1",
@@ -60,16 +61,18 @@
 		"node": "^6.0.0"
 	},
 	"scripts": {
-		"banner": "for m in dist/*.css; do echo '/*!\n * Milligram v1.1.0\n * http://milligram.github.io\n *\n * Copyright (c) 2016 CJ Patoilo\n * Licensed under the MIT license\n*/\n' | cat - $m > temp && mv temp $m; done",
+		"prestart": "npm install",
+		"pretest": "npm install",
+		"banner": "for m in dist/*.css; do echo '/*!\n * Milligram v1.2.0\n * http://milligram.github.io\n *\n * Copyright (c) 2016 CJ Patoilo\n * Licensed under the MIT license\n*/\n' | cat - $m > temp && mv temp $m; done",
 		"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 lint sass autoprefixer banner",
 		"watch": "onchange src -- npm run build",
-		"serve": "browser-sync start -s test --ss dist -f dist",
+		"serve": "browser-sync start --no-notify -s test --ss dist -f dist",
 		"start": "run-p watch serve",
-		"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": "npm run build"
+		"reference": "backstop reference --configPath=backstop.conf.js",
+		"compare": "backstop test --configPath=backstop.conf.js",
+		"test": "run-s build && run-p serve compare"
 	}
 }
diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 <p align="center">
-	<a href="http://milligram.github.io"><img width="100%" src="https://raw.githubusercontent.com/milligram/milligram.github.io/master/img/thumbnail.jpg" alt="Milligram - A minimalist CSS framework"></a>
+	<a href="http://milligram.github.io"><img width="100%" src="https://milligram.github.io/images/thumbnail.jpg" alt="Milligram - A minimalist CSS framework"></a>
 </p>
 
 > A minimalist CSS framework.

diff --git a/src/_Grid.sass b/src/_Grid.sass
@@ -47,12 +47,6 @@
 	&.row-baseline
 		align-items: baseline
 
-	&.row-no-padding
-		padding: 0
-
-		&> .column
-			padding: 0
-
 	.column
 		display: block
 		flex: 1

diff --git a/src/_Link.sass b/src/_Link.sass
@@ -6,6 +6,6 @@ a
 	color: $color-primary
 	text-decoration: none
 
-	&:hover,
-	&:focus
+	&:focus,
+	&:hover
 		color: $color-secondary
diff --git a/test/index.html b/test/index.html
@@ -6,18 +6,18 @@
 		<meta name="author" content="CJ Patoilo">
 		<meta name="description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code.">
 		<title>Milligram | A minimalist CSS framework.</title>
-		<link rel="icon" href="https://milligram.github.io/img/favicon.ico">
+		<link rel="icon" href="https://milligram.github.io/images/favicon.ico">
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.css">
 		<link rel="stylesheet" href="milligram.min.css"><!-- to generate this style run `$ npm start` -->
-		<link rel="stylesheet" href="https://milligram.github.io/css/style.css">
+		<link rel="stylesheet" href="https://milligram.github.io/styles/main.min.css">
 	</head>
 	<body>
 
 		<main class="wrapper">
 
 			<section class="container" id="image">
-				<img src="https://raw.githubusercontent.com/milligram/milligram.github.io/master/img/thumbnail.jpg" alt="Image">
+				<img src="https://raw.githubusercontent.com/milligram/milligram.github.io/master/images/thumbnail.jpg" alt="Image">
 			</section>
 
 			<section class="container" id="typography">

diff --git a/...ual/reference/1_0_blockquotes_0_phone.png → ...560_Blockquotes_0_blockquotes_0_phone.png b/...ual/reference/1_0_blockquotes_0_phone.png → ...560_Blockquotes_0_blockquotes_0_phone.png
diff --git a/...al/reference/1_0_blockquotes_1_laptop.png → ...60_Blockquotes_0_blockquotes_1_laptop.png b/...al/reference/1_0_blockquotes_1_laptop.png → ...60_Blockquotes_0_blockquotes_1_laptop.png
diff --git a/.../visual/reference/2_0_buttons_0_phone.png → ...e/486021560_Buttons_0_buttons_0_phone.png b/.../visual/reference/2_0_buttons_0_phone.png → ...e/486021560_Buttons_0_buttons_0_phone.png
diff --git a/...visual/reference/2_0_buttons_1_laptop.png → .../486021560_Buttons_0_buttons_1_laptop.png b/...visual/reference/2_0_buttons_1_laptop.png → .../486021560_Buttons_0_buttons_1_laptop.png
diff --git a/test/visual/reference/7_0_codes_0_phone.png → ...rence/486021560_Codes_0_codes_0_phone.png b/test/visual/reference/7_0_codes_0_phone.png → ...rence/486021560_Codes_0_codes_0_phone.png
diff --git a/test/visual/reference/7_0_codes_1_laptop.png → ...ence/486021560_Codes_0_codes_1_laptop.png b/test/visual/reference/7_0_codes_1_laptop.png → ...ence/486021560_Codes_0_codes_1_laptop.png
diff --git a/test/visual/reference/4_0_forms_0_phone.png → ...rence/486021560_Forms_0_forms_0_phone.png b/test/visual/reference/4_0_forms_0_phone.png → ...rence/486021560_Forms_0_forms_0_phone.png
diff --git a/test/visual/reference/4_0_forms_1_laptop.png → ...ence/486021560_Forms_0_forms_1_laptop.png b/test/visual/reference/4_0_forms_1_laptop.png → ...ence/486021560_Forms_0_forms_1_laptop.png
diff --git a/test/visual/reference/6_0_grids_0_phone.png → ...rence/486021560_Grids_0_grids_0_phone.png b/test/visual/reference/6_0_grids_0_phone.png → ...rence/486021560_Grids_0_grids_0_phone.png
diff --git a/test/visual/reference/6_0_grids_1_laptop.png → ...ence/486021560_Grids_0_grids_1_laptop.png b/test/visual/reference/6_0_grids_1_laptop.png → ...ence/486021560_Grids_0_grids_1_laptop.png
diff --git a/test/visual/reference/3_0_lists_0_phone.png → ...rence/486021560_Lists_0_lists_0_phone.png b/test/visual/reference/3_0_lists_0_phone.png → ...rence/486021560_Lists_0_lists_0_phone.png
diff --git a/test/visual/reference/3_0_lists_1_laptop.png → ...ence/486021560_Lists_0_lists_1_laptop.png b/test/visual/reference/3_0_lists_1_laptop.png → ...ence/486021560_Lists_0_lists_1_laptop.png
diff --git a/test/visual/reference/5_0_tables_0_phone.png → ...nce/486021560_Tables_0_tables_0_phone.png b/test/visual/reference/5_0_tables_0_phone.png → ...nce/486021560_Tables_0_tables_0_phone.png
diff --git a/.../visual/reference/5_0_tables_1_laptop.png → ...ce/486021560_Tables_0_tables_1_laptop.png b/.../visual/reference/5_0_tables_1_laptop.png → ...ce/486021560_Tables_0_tables_1_laptop.png
diff --git a/...sual/reference/0_0_typography_0_phone.png → ...21560_Typography_0_typography_0_phone.png b/...sual/reference/0_0_typography_0_phone.png → ...21560_Typography_0_typography_0_phone.png
diff --git a/...ual/reference/0_0_typography_1_laptop.png → ...1560_Typography_0_typography_1_laptop.png b/...ual/reference/0_0_typography_1_laptop.png → ...1560_Typography_0_typography_1_laptop.png
diff --git a/...isual/reference/8_0_utilities_0_phone.png → ...6021560_Utilities_0_utilities_0_phone.png b/...isual/reference/8_0_utilities_0_phone.png → ...6021560_Utilities_0_utilities_0_phone.png
diff --git a/...sual/reference/8_0_utilities_1_laptop.png → ...021560_Utilities_0_utilities_1_laptop.png b/...sual/reference/8_0_utilities_1_laptop.png → ...021560_Utilities_0_utilities_1_laptop.png