Merge branch 'master' into gh-pages

kswedberg · kswedberg · commit da9ebf63cd58 · 2017-01-01T14:37:46.000-05:00
diff --git a/demo/demo.css b/demo/demo.css
@@ -1,6 +1,7 @@
 body {
   font-family: Helvetica, Arial, sans-serif;
   color: #353536;
+  line-height: 1.4;
 }
 h1 {
   margin-top: 0;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`body {`
`2`	`2`	`font-family: Helvetica, Arial, sans-serif;`
`3`	`3`	`color: #353536;`
	`4`	`+ line-height: 1.4;`
`4`	`5`	`}`
`5`	`6`	`h1 {`
`6`	`7`	`margin-top: 0;`