Merge branch 'release/v1.3.0' into develop

2017-01-26 07:02:09 -03:00
parent ad1ab12354 dbbb625aa8
commit 57bb2931f7
49 changed files with 48 additions and 54 deletions
@@ -1,7 +1,6 @@
 'use strict'
 const config = {
-	viewports: [
+	viewports: [{
 		{
 		name: 'phone',
 		width: 320,
 		height: 480
@@ -9,8 +8,7 @@ const config = {
 		name: 'laptop',
 		width: 1280,
 		height: 800
-		}
+	}],
 	],
 	scenarios: [{
 		label: 'Typography',
 		url: 'http://localhost:3000',
@@ -119,7 +117,11 @@ const config = {
 		ci_report: 'node_modules/backstopjs/.tmp/ci_report'
 	},
 	engine: 'phantomjs',
-	report: ['browser', 'CLI', 'CI'],
+	report: [
 		'browser',
 		'CLI',
 		'CI'
 	],
 	casperFlags: [],
 	debug: false,
 	port: 3002
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.2.4",
+	"version": "1.3.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "https://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -1,6 +1,6 @@
 {
 	"name": "milligram/milligram",
-	"version": "1.2.4",
+	"version": "1.3.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "https://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -1,5 +1,5 @@
 /*!
- * Milligram v1.2.4
+ * Milligram v1.3.0
 * https://milligram.github.io
 *
 * Copyright (c) 2017 CJ Patoilo
@@ -318,7 +318,7 @@ input[type='radio'] {
 .row .column {
  display: block;
-  flex: 1;
+  flex: 1 1 auto;
  margin-left: 0;
  max-width: 100%;
  width: 100%;
@@ -506,6 +506,7 @@ ul {
 }
 table {
  border-spacing: 0;
  width: 100%;
 }
@@ -548,7 +549,7 @@ h6 {
 }
 h1 {
-  font-size: 4.0rem;
+  font-size: 4.6rem;
  line-height: 1.2;
 }
@@ -558,12 +559,12 @@ h2 {
 }
 h3 {
-  font-size: 3.0rem;
+  font-size: 2.8rem;
  line-height: 1.3;
 }
 h4 {
-  font-size: 2.4rem;
+  font-size: 2.2rem;
  letter-spacing: -.08rem;
  line-height: 1.35;
 }
@@ -580,27 +581,6 @@ h6 {
  line-height: 1.4;
 }
@media (min-width: 40rem) {
  h1 {
    font-size: 5.0rem;
  }
  h2 {
    font-size: 4.2rem;
  }
  h3 {
    font-size: 3.6rem;
  }
  h4 {
    font-size: 3.0rem;
  }
  h5 {
    font-size: 2.4rem;
  }
  h6 {
    font-size: 1.5rem;
  }
 }
 img {
  max-width: 100%;
 }
@@ -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/images/favicon.ico">
+		<link rel="icon" href="https://milligram.github.io/images/icon.png">
 		<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/styles/main.min.css">
+		<link rel="stylesheet" href="https://milligram.github.io/styles/main.css">
 	</head>
 	<body>
@@ -19,7 +19,13 @@
 			<nav class="navigation">
 				<section class="container">
 					<a class="navigation-title" href="https://milligram.github.io/">
-						<img class="img" src="https://milligram.github.io/images/logo.svg" alt="Milligram" title="Milligram">&nbsp;<h1 class="title">Milligram</h1>
+						<svg class="img" version="1.1" viewBox="0 0 463 669">
 							<g transform="translate(0.000000,669.000000) scale(0.100000,-0.100000)">
 								<path d="M2303 6677c-11-13-58-89-393-627-128-206-247-397-265-425-18-27-85-135-150-240-65-104-281-451-480-770-358-575-604-970-641-1032-10-18-45-74-76-126-47-78-106-194-107-212-1-3-11-26-24-53-60-118-132-406-157-623-19-158-8-491 20-649 82-462 291-872 619-1213 192-199 387-340 646-467 335-165 638-235 1020-235 382 0 685 70 1020 235 259 127 454 268 646 467 328 341 537 751 619 1213 28 158 39 491 20 649-25 217-97 505-157 623-13 27-23 50-23 53 0 16-57 127-107 210-32 52-67 110-77 128-37 62-283 457-641 1032-199 319-415 666-480 770-65 105-132 213-150 240-18 28-137 219-265 425-354 570-393 630-400 635-4 3-12-1-17-8zm138-904c118-191 654-1050 1214-1948 148-236 271-440 273-452 2-13 8-23 11-23 14 0 72-99 125-212 92-195 146-384 171-598 116-974-526-1884-1488-2110-868-205-1779 234-2173 1046-253 522-257 1124-10 1659 45 97 108 210 126 225 4 3 9 13 13 22 3 9 126 209 273 445 734 1176 1102 1766 1213 1946 67 108 124 197 126 197 2 0 59-89 126-197zM1080 3228c-75-17-114-67-190-243-91-212-128-368-137-580-34-772 497-1451 1254-1605 77-15 112-18 143-11 155 35 212 213 106 329-32 36-62 48-181 75-223 50-392 140-552 291-115 109-178 192-242 316-101 197-136 355-128 580 3 111 10 167 30 241 30 113 80 237 107 267 11 12 20 26 20 32 0 6 8 22 17 36 26 41 27 99 3 147-54 105-142 149-250 125z"></path>
 							</g>
 						</svg>
 						&nbsp;
 						<h1 class="title">Milligram</h1>
 					</a>
 					<ul class="navigation-list float-right">
 						<li class="navigation-item">
@@ -98,7 +104,7 @@
 		</main>
-		<script src="https://milligram.github.io/scripts/main.min.js"></script>
+		<script src="https://milligram.github.io/scripts/main.js"></script>
 	</body>
 </html>
@@ -1,6 +1,6 @@
 Package.describe({
 	name: 'milligram:milligram',
-	version: '1.2.4',
+	version: '1.3.0',
 	summary: 'A minimalist CSS framework.',
 	git: 'https://github.com/milligram/milligram.git',
 	documentation: 'readme.md'
@@ -1,6 +1,6 @@
 {
 	"name": "milligram",
-	"version": "1.2.4",
+	"version": "1.3.0",
 	"description": "A minimalist CSS framework.",
 	"homepage": "https://milligram.github.io",
 	"repository": "milligram/milligram",
@@ -30,6 +30,12 @@ $ bower install milligram
 $ npm install milligram
 ```
 **Install with Yarn**
 ```sh
 $ yarn add milligram
 ```
 ## Table of Contents
@@ -55,4 +61,4 @@ Want to contribute? Follow these [recommendations](https://github.com/milligram/
 ## License
-Designed with ♥ by [CJ Patoilo](http://twitter.com/cjpatoilo). Licensed under the [MIT License](http://cjpatoilo.mit-license.org).
+Designed with ♥ by [CJ Patoilo](http://cjpatoilo.com). Licensed under the [MIT License](http://cjpatoilo.mit-license.org).
@@ -43,6 +43,6 @@ h5
 	line-height: 1.5
 h6
-	font-size: 1.5rem
+	font-size: 1.6rem
 	letter-spacing: 0
 	line-height: 1.4
@@ -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/images/favicon.ico">
+		<link rel="icon" href="https://milligram.github.io/images/icon.png">
 		<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/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">
+		<link rel="stylesheet" href="https://milligram.github.io/styles/main.css">
 	</head>
 	<body>