Merge branch 'release/v1.2.1'

milligram · Dec 1, 2016 · 89a4842 · 89a4842
2 parents 61ccc63 + 27ce2b3
commit 89a4842
Show file tree

Hide file tree

Showing 17 changed files with 136 additions and 235 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ $RECYCLE.BIN/
 .lock-wscript
 .node_repl_history
 .npm
+.nyc_output
 Desktop.ini
 Icon
 Network Trash Folder

diff --git a/.npmignore b/.npmignore
@@ -10,7 +10,6 @@
 backstop.conf.js
 bower.json
 changelog.md
-component.json
 composer.json
 package.js
 package.json

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -40,14 +40,13 @@
 		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
-		"component.json",
 		"composer.json",
 		"package.js",
 		"package.json",
 		"src",
 		"test"
 	],
 	"dependencies": {
-		"normalize.css": "latest"
+		"normalize.css": "~5.0.0"
 	}
 }
diff --git a/component.json b/component.json
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "milligram/milligram",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -40,14 +40,13 @@
 		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
-		"component.json",
 		"composer.json",
 		"package.js",
 		"package.json",
 		"src",
 		"test"
 	],
 	"dependencies": {
-		"normalize.css": "latest"
+		"normalize.css": "~5.0.0"
 	}
 }
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/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
 	name: 'milligram:milligram',
-	version: '1.2.0',
+	version: '1.2.1',
 	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.2.0",
+	"version": "1.2.1",
 	"description": "A minimalist CSS framework.",
 	"homepage": "http://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -40,29 +40,27 @@
 		"backstop.conf.js",
 		"bower.json",
 		"changelog.md",
-		"component.json",
 		"composer.json",
 		"package.js",
 		"package.json",
 		"src",
 		"test"
 	],
 	"dependencies": {
-		"normalize.css": "latest"
+		"normalize.css": "~5.0.0"
 	},
 	"devDependencies": {
 		"autoprefixer": "^6.5.3",
+		"ava": "^0.17.0",
 		"backstopjs": "^2.3.3",
+		"banner-cli": "^0.4.0",
 		"browser-sync": "^2.18.1",
 		"coveralls": "^2.11.15",
-		"intelli-espower-loader": "^1.0.1",
-		"istanbul": "^0.4.5",
-		"mocha": "^3.1.2",
 		"node-sass": "^3.13.0",
 		"npm-run-all": "^2.3.0",
+		"nyc": "^10.0.0",
 		"onchange": "^2.5.0",
 		"postcss-cli": "^2.6.0",
-		"power-assert": "^1.4.2",
 		"sass-lint": "^1.10.2"
 	},
 	"engines": {
@@ -71,16 +69,16 @@
 	"scripts": {
 		"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",
+		"banner": "banner-cli dist/*.css",
+		"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",
+		"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 --no-notify -s test --ss dist -f dist",
 		"start": "run-p watch serve",
 		"test": "run-s build",
-		"coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- --require intelli-espower-loader test/unit/*.js",
+		"coverage": "nyc ava | coveralls",
 		"reference": "backstop reference --configPath=backstop.conf.js",
 		"compare": "backstop test --configPath=backstop.conf.js",
 		"backstop": "run-s build && run-p serve compare"

diff --git a/readme.md b/readme.md
@@ -1,10 +1,10 @@
-<a align="center" href="http://milligram.github.io"><img width="100%" src="https://milligram.github.io/images/thumbnail.jpg" alt="Milligram - A minimalist CSS framework"></a>
+<a align="center" href="http://milligram.github.io"><img width="100%" src="https://milligram.github.io/images/thumbnail.png" alt="Milligram - A minimalist CSS framework"></a>
 
 > 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)
-[![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/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)
 [![Version Status](https://badge.fury.io/js/milligram.svg)](https://www.npmjs.com/package/milligram)

diff --git a/src/_Base.sass b/src/_Base.sass
@@ -2,6 +2,12 @@
 // Base
 // ––––––––––––––––––––––––––––––––––––––––––––––––––
 
+// Set box-sizing globally to handle padding and border widths
+*,
+*:after,
+*:before
+	box-sizing: inherit
+
 // The base font-size is set at 62.5% for having the convenience
 // of sizing rems in a way that is similar to using px: 1.6rem = 16px
 html
@@ -16,9 +22,3 @@ body
 	font-weight: 300
 	letter-spacing: .01em
 	line-height: 1.6
-
-// Set box-sizing globally to handle padding and border widths
-*,
-*:after,
-*:before
-	box-sizing: inherit
diff --git a/src/_Typography.sass b/src/_Typography.sass
@@ -2,6 +2,10 @@
 // Typography
 // ––––––––––––––––––––––––––––––––––––––––––––––––––
 
+b,
+strong
+	font-weight: bold
+
 p
 	margin-top: 0
 

diff --git a/test/index.html b/test/index.html
@@ -8,7 +8,7 @@
 		<title>Milligram | A minimalist CSS framework.</title>
 		<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="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.css">
 		<link rel="stylesheet" href="milligram.min.css"><!-- to generate this style run `$ npm start` -->
 		<link rel="stylesheet" href="https://milligram.github.io/styles/main.min.css">
 	</head>
@@ -17,7 +17,7 @@
 		<main class="wrapper">
 
 			<section class="container" id="image">
-				<img src="https://raw.githubusercontent.com/milligram/milligram.github.io/master/images/thumbnail.jpg" alt="Image">
+				<img src="https://milligram.github.io/images/thumbnail.png" alt="Milligram | A minimalist CSS framework.">
 			</section>
 
 			<section class="container" id="typography">
@@ -541,7 +541,7 @@ <h5 class="title">Codes</h5>
 				<hr>
 				<div class="example">
 <pre><code>.milligram {
-  color: #9b4dca;
+	color: #9b4dca;
 }</code></pre>
 				</div>
 			</section>