Merged branch feature into master

Wessel Grift · Wessel Grift · commit cce7b6f9aa2e · 2017-02-26T20:34:59.000+01:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pavilion",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Pavilion CSS Framework. A solid starting point without the bloat.",
   "homepage": "http://www.pavilion.io",
   "license": "MIT",
diff --git a/demo/css/pavilion.css b/demo/css/pavilion.css
@@ -1,6 +1,6 @@
 /**
   * Pavilion CSS Framework
-  * Version: 2.0.1
+  * Version: 2.0.3
   * Website: http://www.pavilion.io
   * License: MIT
   */
@@ -263,7 +263,7 @@ body {
     -webkit-tap-highlight-color: transparent;
     line-height: 1.45;
     color: #333333;
-    font-size: 15px;
+    font-size: 16px;
 }
 
 @media (min-width: 768px) {
@@ -1652,7 +1652,6 @@ h5,
 h6 {
     margin: 1.6em 0 0.5em;
     font-weight: 400;
-    line-height: 1.305;
     color: #333333;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
diff --git a/dist/pavilion.css b/dist/pavilion.css
@@ -1,6 +1,6 @@
 /**
   * Pavilion CSS Framework
-  * Version: 2.0.1
+  * Version: 2.0.3
   * Website: http://www.pavilion.io
   * License: MIT
   */
@@ -263,7 +263,7 @@ body {
     -webkit-tap-highlight-color: transparent;
     line-height: 1.45;
     color: #333333;
-    font-size: 15px;
+    font-size: 16px;
 }
 
 @media (min-width: 768px) {
@@ -1652,7 +1652,6 @@ h5,
 h6 {
     margin: 1.6em 0 0.5em;
     font-weight: 400;
-    line-height: 1.305;
     color: #333333;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
diff --git a/dist/pavilion.min.css b/dist/pavilion.min.css
diff --git a/dist/pavilion.min.css.map b/dist/pavilion.min.css.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pavilion",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Pavilion CSS Framework. A solid starting point without the bloat.",
   "homepage": "http://www.pavilion.io",
   "license": "MIT",
diff --git a/scss/pavilion-parts/_typography.scss b/scss/pavilion-parts/_typography.scss
@@ -32,7 +32,6 @@ h5,
 h6 {
     margin: 1.6em 0 0.5em;
     font-weight: $heading-font-weight;
-    line-height: $base-line-height * 0.9;
     color: $heading-color;
     font-family: $heading-font-family;
 }
diff --git a/scss/pavilion-parts/_variables.scss b/scss/pavilion-parts/_variables.scss
@@ -12,7 +12,7 @@ $remsize-small: 10px;
   */
 
 $emsize-normal: 18px;
-$emsize-small: 15px;
+$emsize-small: 16px;
 
 /**
   * Breakpoints

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pavilion",`
`3`		`- "version": "2.0.2",`
	`3`	`+ "version": "2.0.3",`
`4`	`4`	`"description": "Pavilion CSS Framework. A solid starting point without the bloat.",`
`5`	`5`	`"homepage": "http://www.pavilion.io",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ h5,`
`32`	`32`	`h6 {`
`33`	`33`	`margin: 1.6em 0 0.5em;`
`34`	`34`	`font-weight: $heading-font-weight;`
`35`		`- line-height: $base-line-height * 0.9;`
`36`	`35`	`color: $heading-color;`
`37`	`36`	`font-family: $heading-font-family;`
`38`	`37`	`}`