Skip to content

Commit

Permalink
Update typography to the latest version 🚀 (#5)
Browse files Browse the repository at this point in the history
* fix(package): update typography to version 0.15.0
* fix tests

https://greenkeeper.io/
  • Loading branch information
greenkeeper[bot] authored and BarryThePenguin committed Nov 17, 2016
1 parent b62052a commit dfc828d
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"license": "MIT",
"dependencies": {
"postcss": "^5.2.0",
"typography": "^0.14.0"
"typography": "^0.15.0"
},
"devDependencies": {
"istanbul": "^0.4.5",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = {
marginTop: typography.rhythm(2),
marginBottom: typography.rhythm(1)
},
'h3': {
h3: {
lineHeight: typography.rhythm(2),
marginTop: typography.rhythm(1),
marginBottom: typography.rhythm(1)
Expand Down
15 changes: 7 additions & 8 deletions test/fixtures/config/output.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
html {
font-size: 125%;
line-height: 1.5em;
font: 125%/1.5em EB Garamond,sans-serif;
box-sizing: border-box;
overflow-y: scroll
}
Expand Down Expand Up @@ -39,7 +38,7 @@ h1 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand All @@ -55,7 +54,7 @@ h2 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand All @@ -71,7 +70,7 @@ h3 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand All @@ -87,7 +86,7 @@ h4 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand All @@ -103,7 +102,7 @@ h5 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand All @@ -119,7 +118,7 @@ h6 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: Open Sans,sans-serif;
font-weight: 400;
text-rendering: optimizeLegibility;
Expand Down
15 changes: 7 additions & 8 deletions test/fixtures/overrides/output.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
html {
font-size: 100%;
line-height: 1.5em;
font: 100%/1.5em georgia,serif;
box-sizing: border-box;
overflow-y: scroll
}
Expand Down Expand Up @@ -39,7 +38,7 @@ h1 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -55,7 +54,7 @@ h2 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -71,7 +70,7 @@ h3 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -87,7 +86,7 @@ h4 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -103,7 +102,7 @@ h5 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -119,7 +118,7 @@ h6 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand Down
15 changes: 7 additions & 8 deletions test/fixtures/test/output.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
html {
font-size: 100%;
line-height: 1.5em;
font: 100%/1.5em georgia,serif;
box-sizing: border-box;
overflow-y: scroll
}
Expand Down Expand Up @@ -39,7 +38,7 @@ h1 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -55,7 +54,7 @@ h2 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -71,7 +70,7 @@ h3 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -87,7 +86,7 @@ h4 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -103,7 +102,7 @@ h5 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand All @@ -119,7 +118,7 @@ h6 {
padding-right: 0;
padding-top: 0;
margin-bottom: 1.5rem;
color: hsla(0,0%,0%,0.8);
color: inherit;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;
font-weight: bold;
text-rendering: optimizeLegibility;
Expand Down

0 comments on commit dfc828d

Please sign in to comment.