diff --git a/package.json b/package.json index b8e9306..95831b0 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "license": "MIT", "dependencies": { "postcss": "^5.2.0", - "typography": "^0.14.0" + "typography": "^0.15.0" }, "devDependencies": { "istanbul": "^0.4.5", diff --git a/test/fixtures/config/config.js b/test/fixtures/config/config.js index 91aea5d..fa008da 100644 --- a/test/fixtures/config/config.js +++ b/test/fixtures/config/config.js @@ -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) diff --git a/test/fixtures/config/output.css b/test/fixtures/config/output.css index d977af8..94cd2fc 100644 --- a/test/fixtures/config/output.css +++ b/test/fixtures/config/output.css @@ -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 } @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/test/fixtures/overrides/output.css b/test/fixtures/overrides/output.css index 0f60a75..92ba2ff 100644 --- a/test/fixtures/overrides/output.css +++ b/test/fixtures/overrides/output.css @@ -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 } @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/test/fixtures/test/output.css b/test/fixtures/test/output.css index ffe7bd7..d99e3a7 100644 --- a/test/fixtures/test/output.css +++ b/test/fixtures/test/output.css @@ -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 } @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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;