diff --git a/.eleventy.js b/.eleventy.js index 02e1d74a..acee6779 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -5,6 +5,7 @@ const pluginSvgSprite = require("eleventy-plugin-svg-sprite") const pluginPageAssets = require("eleventy-plugin-page-assets") const markdownIt = require("markdown-it") const markdownItFootnote = require("markdown-it-footnote") +const embedEverything = require("eleventy-plugin-embed-everything") const lodash = require("lodash") const filters = require("./utils/filters.js") @@ -34,6 +35,7 @@ module.exports = function (config) { assetsMatching: CONTENT_GLOBS.media, silent: true }) + config.addPlugin(embedEverything) // Filters Object.keys(filters).forEach((filterName) => { diff --git a/package-lock.json b/package-lock.json index cc957ec1..13fabb72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "cssesc": "^3.0.0", "del-cli": "^4.0.1", "dotenv": "^16.1.4", + "eleventy-plugin-embed-everything": "^1.18.2", "eleventy-plugin-svg-sprite": "^1.2.2", "focus-trap": "^6.9.4", "focus-visible": "^5.2.0", @@ -188,6 +189,43 @@ "node": ">=10.0.0" } }, + "node_modules/@11ty/eleventy-fetch": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-fetch/-/eleventy-fetch-4.0.1.tgz", + "integrity": "sha512-yIiLM5ziBmg86i4TlXpBdcIygJHvh/GgPJyAiFOckO9H4y9cQDM8eIcJCUQ4Mum0NEVui/OjhEut2R08xw0vlQ==", + "dependencies": { + "debug": "^4.3.4", + "flat-cache": "^3.0.4", + "node-fetch": "^2.6.7", + "p-queue": "^6.6.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/11ty" + } + }, + "node_modules/@11ty/eleventy-fetch/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@11ty/eleventy-img": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@11ty/eleventy-img/-/eleventy-img-1.1.0.tgz", @@ -4490,6 +4528,14 @@ "node": ">=4.0.0" } }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/defer-to-connect": { "version": "2.0.1", "license": "MIT", @@ -4847,6 +4893,65 @@ "version": "1.4.648", "license": "ISC" }, + "node_modules/eleventy-plugin-embed-everything": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-everything/-/eleventy-plugin-embed-everything-1.18.2.tgz", + "integrity": "sha512-J/zxLnYN7bhVlbEnqxSswxKis6VjDndUFnE3I9ZdCzGFzlWVrXj933w5DOCobx/OZesuYN9VmapNgAHsGvFoAg==", + "dependencies": { + "deepmerge": "^4.3.1", + "eleventy-plugin-embed-instagram": "^1.2.7", + "eleventy-plugin-embed-soundcloud": "^1.2.7", + "eleventy-plugin-embed-spotify": "^1.3.0", + "eleventy-plugin-embed-ted": "^1.0.1", + "eleventy-plugin-embed-tiktok": "^1.1.7", + "eleventy-plugin-embed-twitch": "^1.2.7", + "eleventy-plugin-embed-twitter": "^1.4.0", + "eleventy-plugin-vimeo-embed": "^1.3.8", + "eleventy-plugin-youtube-embed": "^1.10.2" + } + }, + "node_modules/eleventy-plugin-embed-instagram": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-instagram/-/eleventy-plugin-embed-instagram-1.2.7.tgz", + "integrity": "sha512-v6uSqeZiZU5L40lr4NTGBr+2Wbc81SqbNIllESEBQDFhS68g253WqkLaNs7gGh0k5hxhNuMt7ZZEBfous7jksw==" + }, + "node_modules/eleventy-plugin-embed-soundcloud": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-soundcloud/-/eleventy-plugin-embed-soundcloud-1.2.7.tgz", + "integrity": "sha512-0+VNeEcMiRySmyTmPmMhCwkbds44k9W4jWqUwjvk665TRagiXcCdj/BK2wl8vyiVrn/0arWeSCpol4NBb6BIvA==", + "dependencies": { + "@11ty/eleventy-fetch": "^4.0.0" + } + }, + "node_modules/eleventy-plugin-embed-spotify": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-spotify/-/eleventy-plugin-embed-spotify-1.3.0.tgz", + "integrity": "sha512-waVUtW5PO9aKYQEjnvHG4P5bPyKj+SSUBuDtqfF2K+j7dGItmEDD4DP7CmBz6lkn/LlJGmJ7uT4Mr6L4jAP4bg==" + }, + "node_modules/eleventy-plugin-embed-ted": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-ted/-/eleventy-plugin-embed-ted-1.0.1.tgz", + "integrity": "sha512-F1CayKC05sGDAcdEgaZUP3Cs/71mwLT717sIUUiZWu+Gjd1Lp7m2gqL1R/uKnHN/CFxKYTpAA6ZNN/LCjg0ufw==" + }, + "node_modules/eleventy-plugin-embed-tiktok": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-tiktok/-/eleventy-plugin-embed-tiktok-1.1.7.tgz", + "integrity": "sha512-Yb/95hafIsKVsV11ebsX0PoYzpLQWWSbdznbvPfA0HIKjfTHGEt1q0XX5DRGPnn5tor7lM5sha9DMQPzJb/oGQ==" + }, + "node_modules/eleventy-plugin-embed-twitch": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-twitch/-/eleventy-plugin-embed-twitch-1.2.7.tgz", + "integrity": "sha512-E3oUtk5HhfgBaH9xpcnnByoddyyxuj0uhTzxD+UF5ftUU4pa0959HADBI1RuWUDssADzowpSes8m2gBgO4Peeg==" + }, + "node_modules/eleventy-plugin-embed-twitter": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/eleventy-plugin-embed-twitter/-/eleventy-plugin-embed-twitter-1.4.0.tgz", + "integrity": "sha512-1e2oI0OJiVStywT48h6/IJDT4+XlH5EEVT1z87qV8wABAA022m2ozKuog21EEoI217aV2AM89R/FZ1oo1eD/mA==", + "dependencies": { + "@11ty/eleventy-fetch": "^4.0.0", + "deepmerge": "^4.3.1" + } + }, "node_modules/eleventy-plugin-page-assets": { "version": "0.2.0", "resolved": "git+ssh://git@github.com/maxboeck/eleventy-plugin-page-assets.git#6ec9905f37178a76b93c098213e107c00b4fb38c", @@ -5189,6 +5294,22 @@ "node": ">= 0.10" } }, + "node_modules/eleventy-plugin-vimeo-embed": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/eleventy-plugin-vimeo-embed/-/eleventy-plugin-vimeo-embed-1.3.8.tgz", + "integrity": "sha512-XU/XH/lrx9slUifFiRCsFh8XiDsZxCBh5MnFU8wAz8u8rCFX9PpmyveJ2oeDtDZjEINqaDC+YFSPsxoq59S3cQ==" + }, + "node_modules/eleventy-plugin-youtube-embed": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/eleventy-plugin-youtube-embed/-/eleventy-plugin-youtube-embed-1.10.2.tgz", + "integrity": "sha512-N0068hshDe+sG50SEk4zLbwClaTeyl000WiqmNACRG2Iwb2/iTVV4IGTv7d1yWz/5DGVpsHMniboHJSyChvc9w==", + "dependencies": { + "@11ty/eleventy-fetch": "^4.0.0", + "deepmerge": "^4.3.1", + "lite-youtube-embed": "^0.3.0", + "string-replace-async": "^3.0.2" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "license": "MIT" @@ -7275,6 +7396,11 @@ "version": "1.1.0", "license": "MIT" }, + "node_modules/lite-youtube-embed": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/lite-youtube-embed/-/lite-youtube-embed-0.3.2.tgz", + "integrity": "sha512-b1dgKyF4PHhinonmr3PB172Nj0qQgA/7DE9EmeIXHR1ksnFEC2olWjNJyJGdsN2cleKHRjjsmrziKlwXtPlmLQ==" + }, "node_modules/load-json-file": { "version": "4.0.0", "license": "MIT", @@ -13167,13 +13293,6 @@ "version": "0.1.4", "license": "MIT" }, - "node_modules/netlify-cli/node_modules/deepmerge": { - "version": "4.2.2", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/netlify-cli/node_modules/defaults": { "version": "1.0.3", "license": "MIT", @@ -22947,6 +23066,14 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-replace-async": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/string-replace-async/-/string-replace-async-3.0.2.tgz", + "integrity": "sha512-s6hDtXJ7FKyRap/amefqrOMpkEQvxUDueyvJygQeHxCK5Za90dOMgdibCCrPdfdAYAkr8imrZ1PPXW7DOf0RzQ==", + "engines": { + "node": ">= 14.0.0" + } + }, "node_modules/string-width": { "version": "4.2.3", "license": "MIT", diff --git a/package.json b/package.json index 544fa720..d2ddf579 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "cssesc": "^3.0.0", "del-cli": "^4.0.1", "dotenv": "^16.1.4", + "eleventy-plugin-embed-everything": "^1.18.2", "eleventy-plugin-svg-sprite": "^1.2.2", "focus-trap": "^6.9.4", "focus-visible": "^5.2.0", diff --git a/src/assets/styles/base/_typography.scss b/src/assets/styles/base/_typography.scss index 9a010970..57e34ef2 100755 --- a/src/assets/styles/base/_typography.scss +++ b/src/assets/styles/base/_typography.scss @@ -12,21 +12,6 @@ h6 { } h1 { - font-size: 3.625rem; - line-height: 3.9875rem; - - @include mq-down(lg) { - font-size: 3.25rem; - line-height: 3.575rem; - } - - @include mq-down(sm) { - font-size: 2.25rem; - line-height: 2.475rem; - } -} - -h2 { font-size: 3.25rem; line-height: 3.575rem; @@ -41,7 +26,7 @@ h2 { } } -h3 { +h2 { font-size: 2.875rem; line-height: 3.1625rem; @@ -51,21 +36,26 @@ h3 { } } -h4 { +h3 { font-size: 2.25rem; line-height: 2.475rem; } -h5 { +h4 { font-size: 2rem; line-height: 2.2rem; } -h6 { +h5 { font-size: 1.8125rem; line-height: 1.99375rem; } +h6 { + font-size: 1.25rem; + line-height: 1.375rem; +} + // Subtitle p.subtitle { font-size: 1.4375rem; diff --git a/src/assets/styles/components/_content.scss b/src/assets/styles/components/_content.scss index adc7d220..998caf09 100644 --- a/src/assets/styles/components/_content.scss +++ b/src/assets/styles/components/_content.scss @@ -45,7 +45,7 @@ h2 + *, h3 + * { - margin-top: 0 !important; + margin-top: 0; } p { @@ -83,7 +83,7 @@ margin-top: 2rem; margin-bottom: 1.5rem; border-radius: $border-radius-8; - } + } .footnotes-sep { margin-top: 2.75rem; @@ -236,5 +236,25 @@ clip-path: inset(2px 2px round 8px); background: $white; } + + .eleventy-plugin-embed-twitter { + display: flex; + justify-content: center; + + blockquote { + border: none; + } + } + + .eleventy-plugin-youtube-embed { + border-radius: $border-radius-8; + overflow: hidden; + } + + .eleventy-plugin-embed-instagram { + width: 100%; + border-radius: $border-radius-12 !important; + border: none !important; + } } }