From 1255afec2cb07ced23dd0f95b69845acdc5d4ede Mon Sep 17 00:00:00 2001 From: Ludwig Schubert Date: Thu, 12 Oct 2017 15:21:13 -0700 Subject: [PATCH] Minor spacing and style changes --- package-lock.json | 8 ++------ src/components/d-abstract.js | 4 +--- src/components/d-title.js | 2 +- src/styles/d-article.css | 2 +- src/styles/styles-base.css | 22 ++++++++++++++++++++-- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 932eedd..74ae396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1124,8 +1124,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, "concat-map": { "version": "0.0.1", @@ -3563,7 +3562,6 @@ "version": "11.2.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.2.0.tgz", "integrity": "sha512-+5wd6vJuh/Evw3wkmCuKXKibDd5RS7PYZjKaP4s2Hj5W7tvmbuFuaDN4erbH07VznTBFcK+lcsrGVnP6EugXow==", - "dev": true, "requires": { "abab": "1.0.3", "acorn": "4.0.13", @@ -3592,7 +3590,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.1.0.tgz", "integrity": "sha1-X8gnm5PXVIO5ztiyYjmFSEehhXg=", - "dev": true, "requires": { "lodash.sortby": "4.7.0", "tr46": "0.0.3", @@ -3869,8 +3866,7 @@ "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" }, "longest": { "version": "1.0.1", diff --git a/src/components/d-abstract.js b/src/components/d-abstract.js index 7060e2e..e07409a 100644 --- a/src/components/d-abstract.js +++ b/src/components/d-abstract.js @@ -7,15 +7,13 @@ const T = Template('d-abstract', ` display: block; font-size: 1.25rem; line-height: 1.6em; - padding-bottom: 1.5em; color: rgba(0, 0, 0, 0.7); - font-family: georgia, serif; -webkit-font-smoothing: antialiased; } ::slotted(p) { margin-top: 0; - margin-bottom: 0; + margin-bottom: 1em; grid-column: text-start / middle-end; } ${body('d-abstract')} diff --git a/src/components/d-title.js b/src/components/d-title.js index bdc559d..62a63bf 100644 --- a/src/components/d-title.js +++ b/src/components/d-title.js @@ -8,7 +8,7 @@ const T = Template('d-title', ` display: block; } ::slotted(h1) { - grid-column: text-start / span 5; + grid-column: text; font-size: 50px; font-weight: 700; line-height: 1.05em; diff --git a/src/styles/d-article.css b/src/styles/d-article.css index 31c1827..10a2f40 100644 --- a/src/styles/d-article.css +++ b/src/styles/d-article.css @@ -98,7 +98,7 @@ d-article ul, d-article ol { /*font-family: georgia, serif;*/ margin-top: 0; - margin-bottom: 1.7em; + margin-bottom: 1em; -webkit-font-smoothing: antialiased; } diff --git a/src/styles/styles-base.css b/src/styles/styles-base.css index a5279ce..fcb3274 100644 --- a/src/styles/styles-base.css +++ b/src/styles/styles-base.css @@ -1,6 +1,6 @@ html { font-size: 19px; - line-height: 1rem; + line-height: 1.3em; /* font-family: "Libre Franklin", "Helvetica Neue", sans-serif; */ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif; text-size-adjust: 100%; @@ -46,6 +46,16 @@ pre { max-width: 100%; } +p { + margin-top: 0; + margin-bottom: 1em; +} + +d-title p { + font-size: 1.5rem; + line-height: 1.2em; +} + .kicker, .marker { font-size: 15px; @@ -54,11 +64,19 @@ pre { } +/* Headline */ + +@media(min-width: 1024px) { + d-title h1 span { + display: block; + } +} + /* Figure */ figure { position: relative; - margin-bottom: 36px; + margin-bottom: 1.5rem; } figure img {