From 8afccdfe490fe2ac9e9f721a5b191e8d67fd9e9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 00:06:13 +0000 Subject: [PATCH 01/20] =?UTF-8?q?=F0=9F=93=8C=20Bump=20tailwindcss=20from?= =?UTF-8?q?=203.0.24=20to=203.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.0.24 to 3.1.4. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...v3.1.4) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 191 ++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 127 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9419d29..9b0707a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "prettier": "^2.7.1", "prettier-plugin-go-template": "^0.0.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.0.24", + "tailwindcss": "^3.1.4", "vendor-copy": "^3.0.1" } }, @@ -77,18 +77,7 @@ "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || insiders" } }, - "node_modules/acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "dev": true, - "dependencies": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - } - }, - "node_modules/acorn-node/node_modules/acorn": { + "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", @@ -100,6 +89,17 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-node": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", + "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", + "dev": true, + "dependencies": { + "acorn": "^7.0.0", + "acorn-walk": "^7.0.0", + "xtend": "^4.0.2" + } + }, "node_modules/acorn-walk": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", @@ -123,9 +123,9 @@ } }, "node_modules/arg": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz", - "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", "dev": true }, "node_modules/balanced-match": { @@ -1006,7 +1006,7 @@ "node_modules/defined": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==", "dev": true }, "node_modules/delaunator": { @@ -1019,14 +1019,14 @@ } }, "node_modules/detective": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz", - "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", + "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", "dev": true, "dependencies": { - "acorn-node": "^1.6.1", + "acorn-node": "^1.8.2", "defined": "^1.0.0", - "minimist": "^1.1.1" + "minimist": "^1.2.6" }, "bin": { "detective": "bin/detective.js" @@ -1400,9 +1400,9 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz", - "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -1480,10 +1480,19 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/postcss": { - "version": "8.4.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", - "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", + "version": "8.4.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", + "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "funding": [ { @@ -1496,7 +1505,7 @@ } ], "dependencies": { - "nanoid": "^3.3.1", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -1504,6 +1513,23 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-import": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", + "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "dev": true, + "dependencies": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "postcss": "^8.0.0" + } + }, "node_modules/postcss-js": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz", @@ -1652,6 +1678,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dev": true, + "dependencies": { + "pify": "^2.3.0" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1775,15 +1810,15 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.24", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz", - "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz", + "integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==", "dev": true, "dependencies": { - "arg": "^5.0.1", + "arg": "^5.0.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.0", + "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.11", @@ -1793,7 +1828,8 @@ "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.14", + "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", "postcss-nested": "5.0.6", @@ -1930,6 +1966,12 @@ "lodash.merge": "^4.6.2" } }, + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, "acorn-node": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", @@ -1939,14 +1981,6 @@ "acorn": "^7.0.0", "acorn-walk": "^7.0.0", "xtend": "^4.0.2" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } } }, "acorn-walk": { @@ -1966,9 +2000,9 @@ } }, "arg": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz", - "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", "dev": true }, "balanced-match": { @@ -2699,7 +2733,7 @@ "defined": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==", "dev": true }, "delaunator": { @@ -2712,14 +2746,14 @@ } }, "detective": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz", - "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", + "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", "dev": true, "requires": { - "acorn-node": "^1.6.1", + "acorn-node": "^1.8.2", "defined": "^1.0.0", - "minimist": "^1.1.1" + "minimist": "^1.2.6" } }, "didyoumean": { @@ -3018,9 +3052,9 @@ "dev": true }, "nanoid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz", - "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true }, "ncp": { @@ -3074,17 +3108,34 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true + }, "postcss": { - "version": "8.4.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz", - "integrity": "sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==", + "version": "8.4.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", + "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "requires": { - "nanoid": "^3.3.1", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, + "postcss-import": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", + "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "dev": true, + "requires": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + } + }, "postcss-js": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz", @@ -3156,6 +3207,15 @@ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true }, + "read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dev": true, + "requires": { + "pify": "^2.3.0" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -3237,15 +3297,15 @@ "dev": true }, "tailwindcss": { - "version": "3.0.24", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz", - "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz", + "integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==", "dev": true, "requires": { - "arg": "^5.0.1", + "arg": "^5.0.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.0", + "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.11", @@ -3255,7 +3315,8 @@ "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.14", + "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", "postcss-nested": "5.0.6", diff --git a/package.json b/package.json index face6136..aeccd509 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "prettier": "^2.7.1", "prettier-plugin-go-template": "^0.0.13", "rimraf": "^3.0.2", - "tailwindcss": "^3.0.24", + "tailwindcss": "^3.1.4", "vendor-copy": "^3.0.1" }, "vendorCopy": [], From 7099d08355924c7d6524451f87e57ac0ee56366d Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:19:54 +1000 Subject: [PATCH 02/20] =?UTF-8?q?=F0=9F=94=A7=20Remove=20opacity=20functio?= =?UTF-8?q?n=20from=20Tailwind=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tailwind.config.js | 176 +++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 93 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 79e53473..6c3b01f6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,14 +1,3 @@ -const colors = require("tailwindcss/colors"); - -function varWithOpacity(variable) { - return ({ opacityValue }) => { - if (opacityValue === undefined) { - return `rgb(var(${variable}))`; - } - return `rgba(var(${variable}), ${opacityValue})`; - }; -} - module.exports = { content: [ "./layouts/**/*.html", @@ -18,89 +7,90 @@ module.exports = { ], darkMode: "class", theme: { - extend: { - colors: { - neutral: { - DEFAULT: varWithOpacity("--color-neutral"), - 50: varWithOpacity("--color-neutral-50"), - 100: varWithOpacity("--color-neutral-100"), - 200: varWithOpacity("--color-neutral-200"), - 300: varWithOpacity("--color-neutral-300"), - 400: varWithOpacity("--color-neutral-400"), - 500: varWithOpacity("--color-neutral-500"), - 600: varWithOpacity("--color-neutral-600"), - 700: varWithOpacity("--color-neutral-700"), - 800: varWithOpacity("--color-neutral-800"), - 900: varWithOpacity("--color-neutral-900"), - }, - primary: { - 50: varWithOpacity("--color-primary-50"), - 100: varWithOpacity("--color-primary-100"), - 200: varWithOpacity("--color-primary-200"), - 300: varWithOpacity("--color-primary-300"), - 400: varWithOpacity("--color-primary-400"), - 500: varWithOpacity("--color-primary-500"), - 600: varWithOpacity("--color-primary-600"), - 700: varWithOpacity("--color-primary-700"), - 800: varWithOpacity("--color-primary-800"), - 900: varWithOpacity("--color-primary-900"), - }, - secondary: { - 50: varWithOpacity("--color-secondary-50"), - 100: varWithOpacity("--color-secondary-100"), - 200: varWithOpacity("--color-secondary-200"), - 300: varWithOpacity("--color-secondary-300"), - 400: varWithOpacity("--color-secondary-400"), - 500: varWithOpacity("--color-secondary-500"), - 600: varWithOpacity("--color-secondary-600"), - 700: varWithOpacity("--color-secondary-700"), - 800: varWithOpacity("--color-secondary-800"), - 900: varWithOpacity("--color-secondary-900"), - }, + colors: { + transparent: "transparent", + neutral: { + DEFAULT: "rgba(var(--color-neutral), )", + 50: "rgba(var(--color-neutral-50), )", + 100: "rgba(var(--color-neutral-100), )", + 200: "rgba(var(--color-neutral-200), )", + 300: "rgba(var(--color-neutral-300), )", + 400: "rgba(var(--color-neutral-400), )", + 500: "rgba(var(--color-neutral-500), )", + 600: "rgba(var(--color-neutral-600), )", + 700: "rgba(var(--color-neutral-700), )", + 800: "rgba(var(--color-neutral-800), )", + 900: "rgba(var(--color-neutral-900), )", }, - typography: (theme) => ({ + primary: { + 50: "rgba(var(--color-primary-50), )", + 100: "rgba(var(--color-primary-100), )", + 200: "rgba(var(--color-primary-200), )", + 300: "rgba(var(--color-primary-300), )", + 400: "rgba(var(--color-primary-400), )", + 500: "rgba(var(--color-primary-500), )", + 600: "rgba(var(--color-primary-600), )", + 700: "rgba(var(--color-primary-700), )", + 800: "rgba(var(--color-primary-800), )", + 900: "rgba(var(--color-primary-900), )", + }, + secondary: { + 50: "rgba(var(--color-secondary-50), )", + 100: "rgba(var(--color-secondary-100), )", + 200: "rgba(var(--color-secondary-200), )", + 300: "rgba(var(--color-secondary-300), )", + 400: "rgba(var(--color-secondary-400), )", + 500: "rgba(var(--color-secondary-500), )", + 600: "rgba(var(--color-secondary-600), )", + 700: "rgba(var(--color-secondary-700), )", + 800: "rgba(var(--color-secondary-800), )", + 900: "rgba(var(--color-secondary-900), )", + }, + }, + extend: { + typography: ({ theme }) => ({ DEFAULT: { css: { - "--tw-prose-body": theme("colors.neutral.700"), - "--tw-prose-headings": theme("colors.neutral.800"), - "--tw-prose-lead": theme("colors.neutral.500"), - "--tw-prose-links": theme("colors.primary.700"), - "--tw-prose-bold": theme("colors.neutral.900"), - "--tw-prose-counters": theme("colors.neutral.800"), - "--tw-prose-bullets": theme("colors.neutral.500"), - "--tw-prose-hr": theme("colors.neutral.200"), - "--tw-prose-quotes": theme("colors.neutral.700"), - "--tw-prose-quote-borders": theme("colors.primary.200"), - "--tw-prose-captions": theme("colors.neutral.500"), - "--tw-prose-code": theme("colors.secondary.700"), - "--tw-prose-pre-code": theme("colors.neutral.700"), - "--tw-prose-pre-bg": theme("colors.neutral.50"), - "--tw-prose-th-borders": theme("colors.neutral.500"), - "--tw-prose-td-borders": theme("colors.neutral.300"), - "--tw-prose-invert-body": theme("colors.neutral.300"), - "--tw-prose-invert-headings": theme("colors.neutral.50"), - "--tw-prose-invert-lead": theme("colors.neutral.500"), - "--tw-prose-invert-links": theme("colors.primary.400"), - "--tw-prose-invert-bold": theme("colors.neutral.DEFAULT"), - "--tw-prose-invert-counters": theme("colors.neutral.400"), - "--tw-prose-invert-bullets": theme("colors.neutral.600"), - "--tw-prose-invert-hr": theme("colors.neutral.500"), - "--tw-prose-invert-quotes": theme("colors.neutral.200"), - "--tw-prose-invert-quote-borders": theme("colors.primary.900"), - "--tw-prose-invert-captions": theme("colors.neutral.400"), - "--tw-prose-invert-code": theme("colors.secondary.400"), - "--tw-prose-invert-pre-code": theme("colors.neutral.200"), - "--tw-prose-invert-pre-bg": theme("colors.neutral.700"), - "--tw-prose-invert-th-borders": theme("colors.neutral.500"), - "--tw-prose-invert-td-borders": theme("colors.neutral.700"), + "--tw-prose-body": theme("colors.neutral.700 / 1"), + "--tw-prose-headings": theme("colors.neutral.800 / 1"), + "--tw-prose-lead": theme("colors.neutral.500 / 1"), + "--tw-prose-links": theme("colors.primary.700 / 1"), + "--tw-prose-bold": theme("colors.neutral.900 / 1"), + "--tw-prose-counters": theme("colors.neutral.800 / 1"), + "--tw-prose-bullets": theme("colors.neutral.500 / 1"), + "--tw-prose-hr": theme("colors.neutral.200 / 1"), + "--tw-prose-quotes": theme("colors.neutral.700 / 1"), + "--tw-prose-quote-borders": theme("colors.primary.200 / 1"), + "--tw-prose-captions": theme("colors.neutral.500 / 1"), + "--tw-prose-code": theme("colors.secondary.700 / 1"), + "--tw-prose-pre-code": theme("colors.neutral.700 / 1"), + "--tw-prose-pre-bg": theme("colors.neutral.50 / 1"), + "--tw-prose-th-borders": theme("colors.neutral.500 / 1"), + "--tw-prose-td-borders": theme("colors.neutral.300 / 1"), + "--tw-prose-invert-body": theme("colors.neutral.300 / 1"), + "--tw-prose-invert-headings": theme("colors.neutral.50 / 1"), + "--tw-prose-invert-lead": theme("colors.neutral.500 / 1"), + "--tw-prose-invert-links": theme("colors.primary.400 / 1"), + "--tw-prose-invert-bold": theme("colors.neutral.DEFAULT / 1"), + "--tw-prose-invert-counters": theme("colors.neutral.400 / 1"), + "--tw-prose-invert-bullets": theme("colors.neutral.600 / 1"), + "--tw-prose-invert-hr": theme("colors.neutral.500 / 1"), + "--tw-prose-invert-quotes": theme("colors.neutral.200 / 1"), + "--tw-prose-invert-quote-borders": theme("colors.primary.900 / 1"), + "--tw-prose-invert-captions": theme("colors.neutral.400 / 1"), + "--tw-prose-invert-code": theme("colors.secondary.400 / 1"), + "--tw-prose-invert-pre-code": theme("colors.neutral.200 / 1"), + "--tw-prose-invert-pre-bg": theme("colors.neutral.700 / 1"), + "--tw-prose-invert-th-borders": theme("colors.neutral.500 / 1"), + "--tw-prose-invert-td-borders": theme("colors.neutral.700 / 1"), a: { textDecoration: "underline", - textDecorationColor: theme("colors.primary.300"), + textDecorationColor: theme("colors.primary.300 / 1"), fontWeight: "500", "&:hover": { - color: theme("colors.neutral.DEFAULT"), + color: theme("colors.neutral.DEFAULT / 1"), textDecoration: "none", - backgroundColor: theme("colors.primary.600"), + backgroundColor: theme("colors.primary.600 / 1"), borderRadius: "0.09rem", }, }, @@ -108,15 +98,15 @@ module.exports = { color: "var(--tw-prose-code)", }, kbd: { - backgroundColor: theme("colors.neutral.200"), + backgroundColor: theme("colors.neutral.200 / 1"), padding: "0.1rem 0.4rem", borderRadius: "0.25rem", fontSize: "0.9rem", fontWeight: "600", }, mark: { - color: theme("colors.neutral.800"), - backgroundColor: theme("colors.secondary.200"), + color: theme("colors.neutral.800 / 1"), + backgroundColor: theme("colors.secondary.200 / 1"), padding: "0.1rem 0.2rem", borderRadius: "0.12rem", }, @@ -125,14 +115,14 @@ module.exports = { invert: { css: { a: { - textDecorationColor: theme("colors.neutral.600"), + textDecorationColor: theme("colors.neutral.600 / 1"), }, kbd: { - color: theme("colors.neutral.200"), - backgroundColor: theme("colors.neutral.700"), + color: theme("colors.neutral.200 / 1"), + backgroundColor: theme("colors.neutral.700 / 1"), }, mark: { - backgroundColor: theme("colors.secondary.400"), + backgroundColor: theme("colors.secondary.400 / 1"), }, }, }, From d23cca94659c8a966a3c0bbc35290b4fcdb70339 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:20:11 +1000 Subject: [PATCH 03/20] =?UTF-8?q?=F0=9F=92=84=20Rebuild=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/compiled/main.css | 389 +++++++++++++++++++++++++++-------- 1 file changed, 299 insertions(+), 90 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 8010ef8d..e88e7fe7 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,6 +1,6 @@ /*! Congo v2.2.2 | MIT License | https://github.com/jpanther/congo */ -/*! tailwindcss v3.0.24 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v3.1.4 | MIT License | https://tailwindcss.com */ /* 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) @@ -16,7 +16,7 @@ /* 2 */ border-style: solid; /* 2 */ - border-color: #e5e7eb; + border-color: currentColor; /* 2 */ } @@ -187,6 +187,8 @@ textarea { /* 1 */ font-size: 100%; /* 1 */ + font-weight: inherit; + /* 1 */ line-height: inherit; /* 1 */ color: inherit; @@ -415,15 +417,103 @@ video { height: auto; } -/* -Ensure the default browser behavior of the `hidden` attribute. -*/ - -[hidden] { - display: none; +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; } -*, ::before, ::after { +::-webkit-backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; --tw-translate-x: 0; --tw-translate-y: 0; --tw-rotate: 0; @@ -485,14 +575,14 @@ Ensure the default browser behavior of the `hidden` attribute. color: var(--tw-prose-links); text-decoration: underline; font-weight: 500; - -webkit-text-decoration-color: rgb(var(--color-primary-300)); - text-decoration-color: rgb(var(--color-primary-300)); + -webkit-text-decoration-color: rgba(var(--color-primary-300), 1); + text-decoration-color: rgba(var(--color-primary-300), 1); } .prose :where(a):not(:where([class~="not-prose"] *)):hover { - color: rgb(var(--color-neutral)); + color: rgba(var(--color-neutral), 1); text-decoration: none; - background-color: rgb(var(--color-primary-600)); + background-color: rgba(var(--color-primary-600), 1); border-radius: 0.09rem; } @@ -742,38 +832,38 @@ Ensure the default browser behavior of the `hidden` attribute. } .prose { - --tw-prose-body: rgb(var(--color-neutral-700)); - --tw-prose-headings: rgb(var(--color-neutral-800)); - --tw-prose-lead: rgb(var(--color-neutral-500)); - --tw-prose-links: rgb(var(--color-primary-700)); - --tw-prose-bold: rgb(var(--color-neutral-900)); - --tw-prose-counters: rgb(var(--color-neutral-800)); - --tw-prose-bullets: rgb(var(--color-neutral-500)); - --tw-prose-hr: rgb(var(--color-neutral-200)); - --tw-prose-quotes: rgb(var(--color-neutral-700)); - --tw-prose-quote-borders: rgb(var(--color-primary-200)); - --tw-prose-captions: rgb(var(--color-neutral-500)); - --tw-prose-code: rgb(var(--color-secondary-700)); - --tw-prose-pre-code: rgb(var(--color-neutral-700)); - --tw-prose-pre-bg: rgb(var(--color-neutral-50)); - --tw-prose-th-borders: rgb(var(--color-neutral-500)); - --tw-prose-td-borders: rgb(var(--color-neutral-300)); - --tw-prose-invert-body: rgb(var(--color-neutral-300)); - --tw-prose-invert-headings: rgb(var(--color-neutral-50)); - --tw-prose-invert-lead: rgb(var(--color-neutral-500)); - --tw-prose-invert-links: rgb(var(--color-primary-400)); - --tw-prose-invert-bold: rgb(var(--color-neutral)); - --tw-prose-invert-counters: rgb(var(--color-neutral-400)); - --tw-prose-invert-bullets: rgb(var(--color-neutral-600)); - --tw-prose-invert-hr: rgb(var(--color-neutral-500)); - --tw-prose-invert-quotes: rgb(var(--color-neutral-200)); - --tw-prose-invert-quote-borders: rgb(var(--color-primary-900)); - --tw-prose-invert-captions: rgb(var(--color-neutral-400)); - --tw-prose-invert-code: rgb(var(--color-secondary-400)); - --tw-prose-invert-pre-code: rgb(var(--color-neutral-200)); - --tw-prose-invert-pre-bg: rgb(var(--color-neutral-700)); - --tw-prose-invert-th-borders: rgb(var(--color-neutral-500)); - --tw-prose-invert-td-borders: rgb(var(--color-neutral-700)); + --tw-prose-body: rgba(var(--color-neutral-700), 1); + --tw-prose-headings: rgba(var(--color-neutral-800), 1); + --tw-prose-lead: rgba(var(--color-neutral-500), 1); + --tw-prose-links: rgba(var(--color-primary-700), 1); + --tw-prose-bold: rgba(var(--color-neutral-900), 1); + --tw-prose-counters: rgba(var(--color-neutral-800), 1); + --tw-prose-bullets: rgba(var(--color-neutral-500), 1); + --tw-prose-hr: rgba(var(--color-neutral-200), 1); + --tw-prose-quotes: rgba(var(--color-neutral-700), 1); + --tw-prose-quote-borders: rgba(var(--color-primary-200), 1); + --tw-prose-captions: rgba(var(--color-neutral-500), 1); + --tw-prose-code: rgba(var(--color-secondary-700), 1); + --tw-prose-pre-code: rgba(var(--color-neutral-700), 1); + --tw-prose-pre-bg: rgba(var(--color-neutral-50), 1); + --tw-prose-th-borders: rgba(var(--color-neutral-500), 1); + --tw-prose-td-borders: rgba(var(--color-neutral-300), 1); + --tw-prose-invert-body: rgba(var(--color-neutral-300), 1); + --tw-prose-invert-headings: rgba(var(--color-neutral-50), 1); + --tw-prose-invert-lead: rgba(var(--color-neutral-500), 1); + --tw-prose-invert-links: rgba(var(--color-primary-400), 1); + --tw-prose-invert-bold: rgba(var(--color-neutral), 1); + --tw-prose-invert-counters: rgba(var(--color-neutral-400), 1); + --tw-prose-invert-bullets: rgba(var(--color-neutral-600), 1); + --tw-prose-invert-hr: rgba(var(--color-neutral-500), 1); + --tw-prose-invert-quotes: rgba(var(--color-neutral-200), 1); + --tw-prose-invert-quote-borders: rgba(var(--color-primary-900), 1); + --tw-prose-invert-captions: rgba(var(--color-neutral-400), 1); + --tw-prose-invert-code: rgba(var(--color-secondary-400), 1); + --tw-prose-invert-pre-code: rgba(var(--color-neutral-200), 1); + --tw-prose-invert-pre-bg: rgba(var(--color-neutral-700), 1); + --tw-prose-invert-th-borders: rgba(var(--color-neutral-500), 1); + --tw-prose-invert-td-borders: rgba(var(--color-neutral-700), 1); font-size: 1rem; line-height: 1.75; } @@ -886,7 +976,7 @@ Ensure the default browser behavior of the `hidden` attribute. } .prose :where(kbd):not(:where([class~="not-prose"] *)) { - background-color: rgb(var(--color-neutral-200)); + background-color: rgba(var(--color-neutral-200), 1); padding: 0.1rem 0.4rem; border-radius: 0.25rem; font-size: 0.9rem; @@ -894,13 +984,14 @@ Ensure the default browser behavior of the `hidden` attribute. } .prose :where(mark):not(:where([class~="not-prose"] *)) { - color: rgb(var(--color-neutral-800)); - background-color: rgb(var(--color-secondary-200)); + color: rgba(var(--color-neutral-800), 1); + background-color: rgba(var(--color-secondary-200), 1); padding: 0.1rem 0.2rem; border-radius: 0.12rem; } -body a, body button { +body a, +body button { transition-property: color, background-color, border-color, fill, stroke, -webkit-text-decoration-color; transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, -webkit-text-decoration-color; @@ -917,7 +1008,10 @@ body a, body button { /* Search */ -#search-query::-webkit-search-cancel-button, #search-query::-webkit-search-decoration, #search-query::-webkit-search-results-button, #search-query::-webkit-search-results-decoration { +#search-query::-webkit-search-cancel-button, +#search-query::-webkit-search-decoration, +#search-query::-webkit-search-results-button, +#search-query::-webkit-search-results-decoration { display: none; } @@ -929,28 +1023,33 @@ body a, body button { padding-right: 1rem; } -[dir="rtl"] .prose ul > li, [dir="rtl"] .prose ol > li { +[dir="rtl"] .prose ul > li, [dir="rtl"] +.prose ol > li { margin-right: 1.75rem; padding-left: 0px; padding-right: 0.5rem; } -[dir="rtl"] .prose ol > li:before, [dir="rtl"] .prose ul > li:before { +[dir="rtl"] .prose ol > li:before, [dir="rtl"] +.prose ul > li:before { left: auto; right: 0.25rem; } -[dir="rtl"] .prose thead td:first-child, [dir="rtl"] .prose thead th:first-child { +[dir="rtl"] .prose thead td:first-child, [dir="rtl"] +.prose thead th:first-child { padding-right: 0px; } -[dir="rtl"] .prose thead td:last-child, [dir="rtl"] .prose thead th:last-child { +[dir="rtl"] .prose thead td:last-child, [dir="rtl"] +.prose thead th:last-child { padding-left: 0px; } /* Table of Contents */ -.toc ul, .toc li { +.toc ul, +.toc li { list-style-type: none; padding-left: 0px; padding-right: 0px; @@ -1025,12 +1124,18 @@ body a, body button { color: rgba(var(--color-neutral-200), var(--tw-text-opacity)); } -.copy-button:hover, .copy-button:focus, .copy-button:active, .copy-button:active:hover { +.copy-button:hover, +.copy-button:focus, +.copy-button:active, +.copy-button:active:hover { --tw-bg-opacity: 1; background-color: rgba(var(--color-primary-100), var(--tw-bg-opacity)); } -.dark .copy-button:hover, .dark .copy-button:focus, .dark .copy-button:active, .dark .copy-button:active:hover { +.dark .copy-button:hover, .dark +.copy-button:focus, .dark +.copy-button:active, .dark +.copy-button:active:hover { --tw-bg-opacity: 1; background-color: rgba(var(--color-primary-600), var(--tw-bg-opacity)); } @@ -1063,7 +1168,8 @@ body a, body button { /* LineTableTD */ -.chroma .lntd, .chroma .lntd pre { +.chroma .lntd, +.chroma .lntd pre { margin: 0px; border-style: none; padding: 0px; @@ -1112,7 +1218,8 @@ body a, body button { /* LineNumbers */ -.chroma .lnt, .chroma .ln { +.chroma .lnt, +.chroma .ln { margin-right: 0.4em; padding-left: 0.4em; padding-right: 0.4em; @@ -1122,7 +1229,8 @@ body a, body button { color: rgba(var(--color-neutral-600), var(--tw-text-opacity)); } -.dark .chroma .lnt, .dark .chroma .ln { +.dark .chroma .lnt, .dark +.chroma .ln { --tw-text-opacity: 1; color: rgba(var(--color-neutral-300), var(--tw-text-opacity)); } @@ -1147,12 +1255,30 @@ body a, body button { /* Operator */ -.chroma .k, .chroma .kd, .chroma .kn, .chroma .kp, .chroma .kr, .chroma .nc, .chroma .fm, .chroma .nn, .chroma .vc, .chroma .o { +.chroma .k, +.chroma .kd, +.chroma .kn, +.chroma .kp, +.chroma .kr, +.chroma .nc, +.chroma .fm, +.chroma .nn, +.chroma .vc, +.chroma .o { --tw-text-opacity: 1; color: rgba(var(--color-primary-600), var(--tw-text-opacity)); } -.dark .chroma .k, .dark .chroma .kd, .dark .chroma .kn, .dark .chroma .kp, .dark .chroma .kr, .dark .chroma .nc, .dark .chroma .fm, .dark .chroma .nn, .dark .chroma .vc, .dark .chroma .o { +.dark .chroma .k, .dark +.chroma .kd, .dark +.chroma .kn, .dark +.chroma .kp, .dark +.chroma .kr, .dark +.chroma .nc, .dark +.chroma .fm, .dark +.chroma .nn, .dark +.chroma .vc, .dark +.chroma .o { --tw-text-opacity: 1; color: rgba(var(--color-primary-300), var(--tw-text-opacity)); } @@ -1192,12 +1318,32 @@ body a, body button { /* LiteralNumberOct */ -.chroma .kt, .chroma .nv, .chroma .vi, .chroma .vm, .chroma .m, .chroma .mb, .chroma .mf, .chroma .mh, .chroma .mi, .chroma .il, .chroma .mo { +.chroma .kt, +.chroma .nv, +.chroma .vi, +.chroma .vm, +.chroma .m, +.chroma .mb, +.chroma .mf, +.chroma .mh, +.chroma .mi, +.chroma .il, +.chroma .mo { --tw-text-opacity: 1; color: rgba(var(--color-secondary-400), var(--tw-text-opacity)); } -.dark .chroma .kt, .dark .chroma .nv, .dark .chroma .vi, .dark .chroma .vm, .dark .chroma .m, .dark .chroma .mb, .dark .chroma .mf, .dark .chroma .mh, .dark .chroma .mi, .dark .chroma .il, .dark .chroma .mo { +.dark .chroma .kt, .dark +.chroma .nv, .dark +.chroma .vi, .dark +.chroma .vm, .dark +.chroma .m, .dark +.chroma .mb, .dark +.chroma .mf, .dark +.chroma .mh, .dark +.chroma .mi, .dark +.chroma .il, .dark +.chroma .mo { --tw-text-opacity: 1; color: rgba(var(--color-secondary-600), var(--tw-text-opacity)); } @@ -1210,12 +1356,18 @@ body a, body button { /* NameLabel */ -.chroma .n, .chroma .nd, .chroma .ni, .chroma .nl { +.chroma .n, +.chroma .nd, +.chroma .ni, +.chroma .nl { --tw-text-opacity: 1; color: rgba(var(--color-secondary-900), var(--tw-text-opacity)); } -.dark .chroma .n, .dark .chroma .nd, .dark .chroma .ni, .dark .chroma .nl { +.dark .chroma .n, .dark +.chroma .nd, .dark +.chroma .ni, .dark +.chroma .nl { --tw-text-opacity: 1; color: rgba(var(--color-secondary-200), var(--tw-text-opacity)); } @@ -1232,12 +1384,22 @@ body a, body button { /* NameTag */ -.chroma .na, .chroma .nb, .chroma .bp, .chroma .nx, .chroma .py, .chroma .nt { +.chroma .na, +.chroma .nb, +.chroma .bp, +.chroma .nx, +.chroma .py, +.chroma .nt { --tw-text-opacity: 1; color: rgba(var(--color-secondary-800), var(--tw-text-opacity)); } -.dark .chroma .na, .dark .chroma .nb, .dark .chroma .bp, .dark .chroma .nx, .dark .chroma .py, .dark .chroma .nt { +.dark .chroma .na, .dark +.chroma .nb, .dark +.chroma .bp, .dark +.chroma .nx, .dark +.chroma .py, .dark +.chroma .nt { --tw-text-opacity: 1; color: rgba(var(--color-secondary-300), var(--tw-text-opacity)); } @@ -1248,13 +1410,17 @@ body a, body button { /* NameVariableGlobal */ -.chroma .no, .chroma .ne, .chroma .vg { +.chroma .no, +.chroma .ne, +.chroma .vg { font-weight: 600; --tw-text-opacity: 1; color: rgba(var(--color-secondary-400), var(--tw-text-opacity)); } -.dark .chroma .no, .dark .chroma .ne, .dark .chroma .vg { +.dark .chroma .no, .dark +.chroma .ne, .dark +.chroma .vg { --tw-text-opacity: 1; color: rgba(var(--color-secondary-500), var(--tw-text-opacity)); } @@ -1303,12 +1469,42 @@ body a, body button { /* GenericPrompt */ -.chroma .l, .chroma .ld, .chroma .s, .chroma .sa, .chroma .sb, .chroma .sc, .chroma .dl, .chroma .sd, .chroma .s2, .chroma .sh, .chroma .si, .chroma .sx, .chroma .s1, .chroma .gi, .chroma .go, .chroma .gp { +.chroma .l, +.chroma .ld, +.chroma .s, +.chroma .sa, +.chroma .sb, +.chroma .sc, +.chroma .dl, +.chroma .sd, +.chroma .s2, +.chroma .sh, +.chroma .si, +.chroma .sx, +.chroma .s1, +.chroma .gi, +.chroma .go, +.chroma .gp { --tw-text-opacity: 1; color: rgba(var(--color-primary-800), var(--tw-text-opacity)); } -.dark .chroma .l, .dark .chroma .ld, .dark .chroma .s, .dark .chroma .sa, .dark .chroma .sb, .dark .chroma .sc, .dark .chroma .dl, .dark .chroma .sd, .dark .chroma .s2, .dark .chroma .sh, .dark .chroma .si, .dark .chroma .sx, .dark .chroma .s1, .dark .chroma .gi, .dark .chroma .go, .dark .chroma .gp { +.dark .chroma .l, .dark +.chroma .ld, .dark +.chroma .s, .dark +.chroma .sa, .dark +.chroma .sb, .dark +.chroma .sc, .dark +.chroma .dl, .dark +.chroma .sd, .dark +.chroma .s2, .dark +.chroma .sh, .dark +.chroma .si, .dark +.chroma .sx, .dark +.chroma .s1, .dark +.chroma .gi, .dark +.chroma .go, .dark +.chroma .gp { --tw-text-opacity: 1; color: rgba(var(--color-primary-400), var(--tw-text-opacity)); } @@ -1330,13 +1526,15 @@ body a, body button { /* LiteralStringSymbol */ -.chroma .sr, .chroma .ss { +.chroma .sr, +.chroma .ss { font-weight: 600; --tw-text-opacity: 1; color: rgba(var(--color-primary-800), var(--tw-text-opacity)); } -.dark .chroma .sr, .dark .chroma .ss { +.dark .chroma .sr, .dark +.chroma .ss { --tw-text-opacity: 1; color: rgba(var(--color-primary-400), var(--tw-text-opacity)); } @@ -1366,13 +1564,23 @@ body a, body button { /* CommentPreprocFile */ -.chroma .c, .chroma .cm, .chroma .c1, .chroma .cs, .chroma .cp, .chroma .cpf { +.chroma .c, +.chroma .cm, +.chroma .c1, +.chroma .cs, +.chroma .cp, +.chroma .cpf { font-style: italic; --tw-text-opacity: 1; color: rgba(var(--color-neutral-500), var(--tw-text-opacity)); } -.dark .chroma .c, .dark .chroma .cm, .dark .chroma .c1, .dark .chroma .cs, .dark .chroma .cp, .dark .chroma .cpf { +.dark .chroma .c, .dark +.chroma .cm, .dark +.chroma .c1, .dark +.chroma .cs, .dark +.chroma .cp, .dark +.chroma .cpf { --tw-text-opacity: 1; color: rgba(var(--color-neutral-400), var(--tw-text-opacity)); } @@ -1415,7 +1623,8 @@ body a, body button { /* GenericTraceback */ -.chroma .gu, .chroma .gt { +.chroma .gu, +.chroma .gt { --tw-text-opacity: 1; color: rgba(var(--color-neutral-500), var(--tw-text-opacity)); } @@ -2157,13 +2366,13 @@ body a, body button { } .decoration-primary-500 { - -webkit-text-decoration-color: rgb(var(--color-primary-500)); - text-decoration-color: rgb(var(--color-primary-500)); + -webkit-text-decoration-color: rgba(var(--color-primary-500), 1); + text-decoration-color: rgba(var(--color-primary-500), 1); } .decoration-neutral-300 { - -webkit-text-decoration-color: rgb(var(--color-neutral-300)); - text-decoration-color: rgb(var(--color-neutral-300)); + -webkit-text-decoration-color: rgba(var(--color-neutral-300), 1); + text-decoration-color: rgba(var(--color-neutral-300), 1); } .opacity-0 { @@ -2249,8 +2458,8 @@ body a, body button { } .hover\:decoration-primary-400:hover { - -webkit-text-decoration-color: rgb(var(--color-primary-400)); - text-decoration-color: rgb(var(--color-primary-400)); + -webkit-text-decoration-color: rgba(var(--color-primary-400), 1); + text-decoration-color: rgba(var(--color-primary-400), 1); } .hover\:decoration-2:hover { @@ -2299,8 +2508,8 @@ body a, body button { } .group:hover .group-hover\:decoration-primary-500 { - -webkit-text-decoration-color: rgb(var(--color-primary-500)); - text-decoration-color: rgb(var(--color-primary-500)); + -webkit-text-decoration-color: rgba(var(--color-primary-500), 1); + text-decoration-color: rgba(var(--color-primary-500), 1); } .group:hover .group-hover\:opacity-100 { @@ -2447,17 +2656,17 @@ body a, body button { } .dark .dark\:prose-invert :where(a):not(:where([class~="not-prose"] *)) { - -webkit-text-decoration-color: rgb(var(--color-neutral-600)); - text-decoration-color: rgb(var(--color-neutral-600)); + -webkit-text-decoration-color: rgba(var(--color-neutral-600), 1); + text-decoration-color: rgba(var(--color-neutral-600), 1); } .dark .dark\:prose-invert :where(kbd):not(:where([class~="not-prose"] *)) { - color: rgb(var(--color-neutral-200)); - background-color: rgb(var(--color-neutral-700)); + color: rgba(var(--color-neutral-200), 1); + background-color: rgba(var(--color-neutral-700), 1); } .dark .dark\:prose-invert :where(mark):not(:where([class~="not-prose"] *)) { - background-color: rgb(var(--color-secondary-400)); + background-color: rgba(var(--color-secondary-400), 1); } .dark .dark\:inline { From 7fa433ddab4463b53a2af995408884838c24406b Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:25:25 +1000 Subject: [PATCH 04/20] =?UTF-8?q?=F0=9F=93=9D=20Update=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed10468c..12086a65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- Upgrade to Tailwind v3.1.4 ([#225](https://github.com/jpanther/congo/pull/225)) + ## [2.2.3] - 2022-06-22 ### Changed From 84e5e4697163d9c50f2b06c25fdc052f95117ea6 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 25 Jun 2022 10:40:24 +1000 Subject: [PATCH 05/20] =?UTF-8?q?=F0=9F=90=9B=20Fix=20search=20not=20showi?= =?UTF-8?q?ng=20when=20main=20menu=20empty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ layouts/partials/header.html | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12086a65..d09dfaad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Upgrade to Tailwind v3.1.4 ([#225](https://github.com/jpanther/congo/pull/225)) +### Fixed + +- Search would not appear in header if main menu had no links to display + ## [2.2.3] - 2022-06-22 ### Changed diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 06a0f63f..82813460 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -27,20 +27,22 @@ {{ partial "translations.html" . }} {{/* Main menu */}} - {{ if .Site.Menus.main }} + {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }} {{ end }} -
+
{{/* Copyright */}} -

- {{- with .Site.Params.copyright }} - {{ . | emojify | markdownify }} - {{- else }} - © - {{ now.Format "2006" }} - {{ .Site.Author.name | markdownify | emojify }} - {{- end }} -

+ {{ if .Site.Params.showCopyright | default true }} +

+ {{- with .Site.Params.copyright }} + {{ . | emojify | markdownify }} + {{- else }} + © + {{ now.Format "2006" }} + {{ .Site.Author.name | markdownify | emojify }} + {{- end }} +

+ {{ end }} {{/* Theme attribution */}} - {{ if .Site.Params.attribution | default true }} + {{ if .Site.Params.showThemeAttribution | default true }}

{{ $hugo := printf `Hugo` From f007a1f294ab9b1b8caea36b8f279f6709bf4d4c Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 25 Jun 2022 13:04:41 +1000 Subject: [PATCH 10/20] =?UTF-8?q?=F0=9F=A9=B9=20Improve=20scroll=20to=20to?= =?UTF-8?q?p=20link=20alignment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + assets/css/compiled/main.css | 4 ++-- layouts/_default/baseof.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d51774..e8b2615a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Search link does not appear in header if main menu has no items to display - Search only returns results in the primary language when multiple languages are available ([#229](https://github.com/jpanther/congo/issues/229)) +- Scroll to top misaligned with the footer at small viewport heights - Link to homepage would be incorrect in some deployments if `baseURL` contained sub-directories in the path ## [2.2.3] - 2022-06-22 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index ee600756..8c516596 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1672,8 +1672,8 @@ body button { left: 0px; } -.top-\[110vh\] { - top: 110vh; +.top-\[100vh\] { + top: 100vh; } .bottom-0 { diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index c999751a..9c4d0e38 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -31,7 +31,7 @@ {{- block "main" . }}{{- end }} {{ if and (.Site.Params.showScrollToTop | default true) (gt .WordCount 200) }}

Date: Sat, 25 Jun 2022 14:17:44 +1000 Subject: [PATCH 11/20] =?UTF-8?q?=E2=9C=A8=20Improve=20layout=20of=20comme?= =?UTF-8?q?nts=20and=20add=20params=20to=20toggle=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref #207 --- CHANGELOG.md | 2 ++ assets/css/compiled/main.css | 18 +++++++++--------- config/_default/params.toml | 1 + exampleSite/config/_default/params.toml | 1 + exampleSite/content/docs/configuration.md | 1 + exampleSite/content/docs/front-matter.md | 1 + layouts/_default/single.html | 15 ++++++++++++--- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8b2615a..ee5c2468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added +- Front matter support for showing or hiding comments on a per article basis - `showCopyright` and `showThemeAttribution` parameters that allow more control over how the site footer is displayed ### Changed - Search will now return results for all page types, including lists and taxonomies +- Comments partials are now better considered within the page layout - Upgrade to Tailwind v3.1.4 ([#225](https://github.com/jpanther/congo/pull/225)) ### Fixed diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 8c516596..f03f869a 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -2059,16 +2059,16 @@ body button { border-color: rgba(var(--color-neutral-400), var(--tw-border-opacity)); } -.border-neutral-200 { - --tw-border-opacity: 1; - border-color: rgba(var(--color-neutral-200), var(--tw-border-opacity)); -} - .border-neutral-300 { --tw-border-opacity: 1; border-color: rgba(var(--color-neutral-300), var(--tw-border-opacity)); } +.border-neutral-200 { + --tw-border-opacity: 1; + border-color: rgba(var(--color-neutral-200), var(--tw-border-opacity)); +} + .border-primary-400 { --tw-border-opacity: 1; border-color: rgba(var(--color-primary-400), var(--tw-border-opacity)); @@ -2203,14 +2203,14 @@ body button { padding-top: 2rem; } -.pl-2 { - padding-left: 0.5rem; -} - .pt-3 { padding-top: 0.75rem; } +.pl-2 { + padding-left: 0.5rem; +} + .pb-4 { padding-bottom: 1rem; } diff --git a/config/_default/params.toml b/config/_default/params.toml index 67ba5962..fea478ea 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -39,6 +39,7 @@ enableCodeCopy = false showTableOfContents = false showTaxonomies = false showWordCount = false + showComments = false # sharingLinks = ["facebook", "twitter", "pinterest", "reddit", "linkedin", "email"] [list] diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 642ec644..f19be023 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -39,6 +39,7 @@ mainSections = ["samples"] showTableOfContents = true showTaxonomies = false showWordCount = false + showComments = false # sharingLinks = ["facebook", "twitter", "pinterest", "reddit", "linkedin", "email"] [list] diff --git a/exampleSite/content/docs/configuration.md b/exampleSite/content/docs/configuration.md index fdc36fd3..183b8721 100644 --- a/exampleSite/content/docs/configuration.md +++ b/exampleSite/content/docs/configuration.md @@ -142,6 +142,7 @@ Many of the article defaults here can be overridden on a per article basis by sp |`article.showTableOfContents`|`false`|Whether or not the table of contents is displayed on articles.| |`article.showTaxonomies`|`false`|Whether or not the taxonomies related to this article are displayed.| |`article.showWordCount`|`false`|Whether or not article word counts are displayed.| +|`article.showComments`|`false`|Whether or not the [comments partial]({{< ref "partials#comments" >}}) is included after the article footer.| |`article.sharingLinks`|_Not set_|Which sharing links to display at the end of each article. When not provided, or set to `false` no links will be displayed.| |`list.showBreadcrumbs`|`false`|Whether or not breadcrumbs are displayed in the header on list pages.| |`list.showTableOfContents`|`false`|Whether or not the table of contents is displayed on list pages.| diff --git a/exampleSite/content/docs/front-matter.md b/exampleSite/content/docs/front-matter.md index 170f49f3..d50bc7d1 100644 --- a/exampleSite/content/docs/front-matter.md +++ b/exampleSite/content/docs/front-matter.md @@ -35,6 +35,7 @@ Front matter parameter default values are inherited from the theme's [base confi |`showTaxonomies`|`article.showTaxonomies`|Whether or not the taxonomies that relate to this article are displayed.| |`showTableOfContents`|`article.showTableOfContents`|Whether or not the table of contents is displayed on this article.| |`showWordCount`|`article.showWordCount`|Whether or not the article word count is displayed.| +|`showComments`|`article.showComments`|Whether or not the [comments partial]({{< ref "partials#comments" >}}) is included after the article footer.| |`showSummary`|`list.showSummary`|Whether or not the article summary should be displayed on list pages.| |`summary`|Auto generated using `summaryLength` (see [site configuration]({{< ref "configuration#site-configuration" >}}))|When `showSummary` is enabled, this is the Markdown string to be used as the summary for this article.| |`xml`|`true` unless excluded by `sitemap.excludedKinds`|Whether or not this article is included in the generated `/sitemap.xml` file.| diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b78d7ac4..49deed79 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -27,9 +27,18 @@ {{ partial "author.html" . }} {{ partial "sharing-links.html" . }} {{ partial "article-pagination.html" . }} + {{ if .Params.showComments | default (.Site.Params.article.showComments | default false) }} + {{ if templates.Exists "partials/comments.html" }} +
+
+
+ {{ partial "comments.html" . }} +
+
+ {{ else }} + {{ warnf "[CONGO] Comments are enabled for %s but no comments partial exists." .File.Path }} + {{ end }} + {{ end }} - {{ if templates.Exists "partials/comments.html" }} - {{ partial "comments.html" . }} - {{ end }} {{ end }} From 337e355ba229881487d361b58a46d55cff48c8a2 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 25 Jun 2022 14:53:34 +1000 Subject: [PATCH 12/20] =?UTF-8?q?=F0=9F=92=84=20Reduce=20whitespace=20at?= =?UTF-8?q?=20the=20top=20of=20prose=20content?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref #226 --- CHANGELOG.md | 1 + assets/css/compiled/main.css | 10 ++++++---- assets/css/main.css | 5 +++++ layouts/partials/toc.html | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee5c2468..67c569c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Search will now return results for all page types, including lists and taxonomies - Comments partials are now better considered within the page layout +- Reduced whitespace at the top of the main content block - Upgrade to Tailwind v3.1.4 ([#225](https://github.com/jpanther/congo/pull/225)) ### Fixed diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index f03f869a..e8fdb807 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1046,6 +1046,12 @@ body button { padding-left: 0px; } +/* Adjust first child within prose */ + +.prose div.min-w-0.max-w-prose > *:first-child { + margin-top: 0.75rem; +} + /* Table of Contents */ .toc ul, @@ -2898,10 +2904,6 @@ body button { order: 9999; } - .lg\:mt-3 { - margin-top: 0.75rem; - } - .lg\:hidden { display: none; } diff --git a/assets/css/main.css b/assets/css/main.css index 8a0d7428..7285f736 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -42,6 +42,11 @@ body button { @apply rtl:pl-0; } +/* Adjust first child within prose */ +.prose div.min-w-0.max-w-prose > *:first-child { + @apply mt-3; +} + /* Table of Contents */ .toc ul, .toc li { diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index bd32816e..7a46e177 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -1,4 +1,4 @@ -
+
From bc84cde658828fe5e08658fec5e4b4c832d8ae54 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 25 Jun 2022 15:03:45 +1000 Subject: [PATCH 13/20] =?UTF-8?q?=F0=9F=93=9D=20Add=20links=20to=20discuss?= =?UTF-8?q?ions=20in=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c569c1..6be6a5bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added -- Front matter support for showing or hiding comments on a per article basis -- `showCopyright` and `showThemeAttribution` parameters that allow more control over how the site footer is displayed +- Front matter support for showing or hiding comments on a per article basis ([#207](https://github.com/jpanther/congo/discussions/207)) +- `showCopyright` and `showThemeAttribution` parameters that allow more control over how the site footer is displayed ([#192](https://github.com/jpanther/congo/discussions/192)) ### Changed - Search will now return results for all page types, including lists and taxonomies - Comments partials are now better considered within the page layout -- Reduced whitespace at the top of the main content block +- Reduced whitespace at the top of the main content block ([#226](https://github.com/jpanther/congo/discussions/226)) - Upgrade to Tailwind v3.1.4 ([#225](https://github.com/jpanther/congo/pull/225)) ### Fixed @@ -125,7 +125,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed - Upgrade SVG icons to FontAwesome 6: - - New icons for Hashnode, bug, check, comment, light bulb, list, pencil, skull, tag, and information. + - New icons for Hashnode, bug, check, comment, light bulb, list, pencil, skull, tag, and information. ([#136](https://github.com/jpanther/congo/discussions/136)) - ⚠️ The `exclamation-triangle` icon has been renamed `triangle-exclamation` - ⚠️ The `times` icon has been renamed `xmark` - ⚠️ The `stackoverflow` icon has been renamed `stack-overflow` @@ -210,7 +210,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Site search powered by Fuse.js - Automatic Markdown image resizing and srcset generation - Performance and Accessibility improvements to achieve perfect Lighthouse scores -- Tables of contents on article pages +- Tables of contents on article pages ([#47](https://github.com/jpanther/congo/discussions/47)) - Code copy buttons in article content - Taxonomy and term listings now support Markdown content - Taxonomies on article and list pages From 5ebc70ab3ab12b039d87afa794f1820299947402 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 25 Jun 2022 15:31:08 +1000 Subject: [PATCH 14/20] =?UTF-8?q?=F0=9F=90=9B=20Fix=20external=20article?= =?UTF-8?q?=20link=20alignment=20and=20add=20RTL=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ assets/css/compiled/main.css | 12 ++++++++---- layouts/partials/article-link.html | 7 ++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6be6a5bc..1bb53c5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Search link does not appear in header if main menu has no items to display - Search only returns results in the primary language when multiple languages are available ([#229](https://github.com/jpanther/congo/issues/229)) +- Arrow on external article links not aligned correctly when title wraps onto multiple lines +- Arrow on external article links points the wrong direction for RTL languages - Scroll to top misaligned with the footer at small viewport heights - Link to homepage would be incorrect in some deployments if `baseURL` contained sub-directories in the path diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index e8fdb807..8e7c6b64 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1776,10 +1776,6 @@ body button { margin-top: 1.5rem; } -.-mt-2 { - margin-top: -0.5rem; -} - .mr-3 { margin-right: 0.75rem; } @@ -2530,6 +2526,10 @@ body button { left: -1.5rem; } +[dir="ltr"] .ltr\:ml-\[0\.1rem\] { + margin-left: 0.1rem; +} + [dir="ltr"] .ltr\:ml-2 { margin-left: 0.5rem; } @@ -2590,6 +2590,10 @@ body button { right: -1.5rem; } +[dir="rtl"] .rtl\:mr-\[0\.1rem\] { + margin-right: 0.1rem; +} + [dir="rtl"] .rtl\:mr-2 { margin-right: 0.5rem; } diff --git a/layouts/partials/article-link.html b/layouts/partials/article-link.html index 8916b312..4bf143ee 100644 --- a/layouts/partials/article-link.html +++ b/layouts/partials/article-link.html @@ -1,5 +1,5 @@
-

+

{{ with .Params.externalUrl }} {{ $.Title | emojify }} - ↗ + ↗ + ↖ {{ else }} Date: Mon, 27 Jun 2022 10:16:36 +1000 Subject: [PATCH 15/20] =?UTF-8?q?=F0=9F=92=84=20Clean=20up=20article=20lin?= =?UTF-8?q?k=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/compiled/main.css | 34 ++++++++++++------------------ layouts/partials/article-link.html | 34 ++++++++++++++++-------------- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 8e7c6b64..c7633db6 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1932,14 +1932,14 @@ body button { max-width: 65ch; } -.max-w-\[10rem\] { - max-width: 10rem; -} - .max-w-3xl { max-width: 48rem; } +.max-w-\[10rem\] { + max-width: 10rem; +} + .flex-none { flex: none; } @@ -2181,11 +2181,6 @@ body button { padding-bottom: 2.5rem; } -.py-6 { - padding-top: 1.5rem; - padding-bottom: 1.5rem; -} - .py-2 { padding-top: 0.5rem; padding-bottom: 0.5rem; @@ -2201,6 +2196,11 @@ body button { padding-bottom: 0.75rem; } +.py-6 { + padding-top: 1.5rem; + padding-bottom: 1.5rem; +} + .pt-8 { padding-top: 2rem; } @@ -2229,6 +2229,10 @@ body button { text-align: right; } +.align-top { + vertical-align: top; +} + .align-text-bottom { vertical-align: text-bottom; } @@ -2526,10 +2530,6 @@ body button { left: -1.5rem; } -[dir="ltr"] .ltr\:ml-\[0\.1rem\] { - margin-left: 0.1rem; -} - [dir="ltr"] .ltr\:ml-2 { margin-left: 0.5rem; } @@ -2590,10 +2590,6 @@ body button { right: -1.5rem; } -[dir="rtl"] .rtl\:mr-\[0\.1rem\] { - margin-right: 0.1rem; -} - [dir="rtl"] .rtl\:mr-2 { margin-right: 0.5rem; } @@ -2839,10 +2835,6 @@ body button { flex-direction: row; } - .sm\:items-center { - align-items: center; - } - .sm\:p-6 { padding: 1.5rem; } diff --git a/layouts/partials/article-link.html b/layouts/partials/article-link.html index 4bf143ee..152812d3 100644 --- a/layouts/partials/article-link.html +++ b/layouts/partials/article-link.html @@ -1,20 +1,22 @@
-

+

{{ with .Params.externalUrl }} - {{ $.Title | emojify }} - - ↗ - ↖ - +
+ {{ $.Title | emojify }} + + ↗ + ↖ + +
{{ else }} {{ end }} {{ if and .Draft .Site.Params.article.showDraftLabel }} -
+
{{ partial "badge.html" (i18n "article.draft" | emojify) }}
{{ end }} From efbeceaa4ff1591790a70eda1d4629d8901ed082 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:30:07 +1000 Subject: [PATCH 16/20] =?UTF-8?q?=F0=9F=92=A5=20Move=20footer=20parameters?= =?UTF-8?q?=20to=20their=20own=20sub-group?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + config/_default/params.toml | 10 ++++++---- exampleSite/config/_default/params.toml | 10 ++++++---- exampleSite/content/docs/configuration.md | 8 ++++---- layouts/_default/baseof.html | 4 ++-- layouts/partials/footer.html | 8 ++++---- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb53c5d..5571dcd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed +- ⚠️ Footer configuration parameters are now in their own `footer` sub-group - Search will now return results for all page types, including lists and taxonomies - Comments partials are now better considered within the page layout - Reduced whitespace at the top of the main content block ([#226](https://github.com/jpanther/congo/discussions/226)) diff --git a/config/_default/params.toml b/config/_default/params.toml index fea478ea..1f9bcf8a 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -8,10 +8,6 @@ colorScheme = "congo" defaultAppearance = "light" # valid options: light or dark autoSwitchAppearance = true -showAppearanceSwitcher = false -showCopyright = true -showThemeAttribution = true -showScrollToTop = true enableSearch = false enableCodeCopy = false @@ -19,6 +15,12 @@ enableCodeCopy = false # mainSections = ["section1", "section2"] # robots = "" +[footer] + showCopyright = true + showThemeAttribution = true + showAppearanceSwitcher = false + showScrollToTop = true + [homepage] layout = "page" # valid options: page, profile, custom showRecent = false diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index f19be023..5ce3dc2b 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -8,10 +8,6 @@ colorScheme = "congo" defaultAppearance = "light" # valid options: light or dark autoSwitchAppearance = true -showAppearanceSwitcher = true -showCopyright = true -showThemeAttribution = true -showScrollToTop = true enableSearch = true enableCodeCopy = true @@ -19,6 +15,12 @@ enableCodeCopy = true mainSections = ["samples"] # robots = "" +[footer] + showCopyright = true + showThemeAttribution = true + showAppearanceSwitcher = true + showScrollToTop = true + [homepage] layout = "custom" # valid options: page, profile, custom showRecent = true diff --git a/exampleSite/content/docs/configuration.md b/exampleSite/content/docs/configuration.md index 183b8721..a692026d 100644 --- a/exampleSite/content/docs/configuration.md +++ b/exampleSite/content/docs/configuration.md @@ -116,15 +116,15 @@ Many of the article defaults here can be overridden on a per article basis by sp |`colorScheme`|`"congo"`|The theme colour scheme to use. Valid values are `congo` (default), `avocado`, `ocean`, `fire` and `slate`. Refer to the [Colour Schemes]({{< ref "getting-started#colour-schemes" >}}) section for more details.| |`defaultAppearance`|`"light"`|The default theme appearance, either `light` or `dark`.| |`autoSwitchAppearance`|`true`|Whether the theme appearance automatically switches based upon the visitor's operating system preference. Set to `false` to force the site to always use the `defaultAppearance`.| -|`showAppearanceSwitcher`|`false`|Whether or not to show the appearance switcher in the site footer. The browser's local storage is used to persist the visitor's preference.| -|`showCopyright`|`true`|Whether or not to show the copyright string in the site footer. Note that the string itself can be customised using the `copyright` parameter in the [languages configuration](#language-and-i18n).| -|`showThemeAttribution`|`true`|Whether or not to show the "powered by" theme attribution in the site footer. If you choose to disable this message, please consider attributing the theme somewhere else on your site (for example, on your about page).| -|`showScrollToTop`|`true`|When set to `true` the scroll to top arrow is displayed.| |`enableSearch`|`false`|Whether site search is enabled. Set to `true` to enable search functionality. Note that the search feature depends on the `outputs.home` setting in the [site configuration](#site-configuration) being set correctly.| |`enableCodeCopy`|`false`|Whether copy-to-clipboard buttons are enabled for `` blocks. The `highlight.noClasses` parameter must be set to `false` for code copy to function correctly. Read more about [other configuration files](#other-configuration-files) below.| |`logo`|_Not set_|The relative path to the site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions.| |`mainSections`|_Not set_|The sections that should be displayed in the recent articles list. If not provided the section with the greatest number of articles is used.| |`robots`|_Not set_|String that indicates how robots should handle your site. If set, it will be output in the page head. Refer to [Google's docs](https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives) for valid values.| +|`footer.showCopyright`|`true`|Whether or not to show the copyright string in the site footer. Note that the string itself can be customised using the `copyright` parameter in the [languages configuration](#language-and-i18n).| +|`footer.showThemeAttribution`|`true`|Whether or not to show the "powered by" theme attribution in the site footer. If you choose to disable this message, please consider attributing the theme somewhere else on your site (for example, on your about page).| +|`footer.showAppearanceSwitcher`|`false`|Whether or not to show the appearance switcher in the site footer. The browser's local storage is used to persist the visitor's preference.| +|`footer.showScrollToTop`|`true`|When set to `true` the scroll to top arrow is displayed.| |`homepage.layout`|`"page"`|The layout of the homepage. Valid values are `page`, `profile` or `custom`. When set to `custom`, you must provide your own layout by creating a `/layouts/partials/home/custom.html` file. Refer to the [Homepage Layout]({{< ref "homepage-layout" >}}) section for more details.| |`homepage.showRecent`|`false`|Whether or not to display the recent articles list on the homepage.| |`article.showDate`|`true`|Whether or not article dates are displayed.| diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 9c4d0e38..3e80305f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -28,8 +28,8 @@ {{- partial "header.html" . -}}
- {{- block "main" . }}{{- end }} - {{ if and (.Site.Params.showScrollToTop | default true) (gt .WordCount 200) }} + {{ block "main" . }}{{ end }} + {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f4cf8343..2103e34a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -21,7 +21,7 @@
{{/* Appearance switch */}} - {{ if .Site.Params.showAppearanceSwitcher | default false }} + {{ if .Site.Params.footer.showAppearanceSwitcher | default false }}
From e2b7af1e725d201b0b2508c482728b48d7f706f3 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 27 Jun 2022 12:31:15 +1000 Subject: [PATCH 17/20] =?UTF-8?q?=E2=9C=A8=20Add=20header=20layouts=20and?= =?UTF-8?q?=20hamburger=20menu=20layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref #167, #88, #43, #29 --- CHANGELOG.md | 3 + assets/css/compiled/main.css | 41 +++++++++++++ assets/css/main.css | 11 ++++ assets/icons/bars.svg | 1 + config/_default/params.toml | 3 + exampleSite/config/_default/params.toml | 3 + exampleSite/content/docs/configuration.md | 1 + exampleSite/content/samples/icons.md | 1 + layouts/_default/baseof.html | 7 ++- layouts/partials/header.html | 63 ------------------- layouts/partials/header/basic.html | 57 +++++++++++++++++ layouts/partials/header/hamburger.html | 75 +++++++++++++++++++++++ layouts/partials/translations.html | 4 +- 13 files changed, 204 insertions(+), 66 deletions(-) create mode 100644 assets/icons/bars.svg delete mode 100644 layouts/partials/header.html create mode 100644 layouts/partials/header/basic.html create mode 100644 layouts/partials/header/hamburger.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 5571dcd5..b022e5f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added +- Header layouts for selecting a preferred header style +- Hamburger menu header layout with popover main menu ([#167](https://github.com/jpanther/congo/discussions/167), [#88](https://github.com/jpanther/congo/discussions/88), [#43](https://github.com/jpanther/congo/discussions/43), [#29](https://github.com/jpanther/congo/discussions/29)) - Front matter support for showing or hiding comments on a per article basis ([#207](https://github.com/jpanther/congo/discussions/207)) - `showCopyright` and `showThemeAttribution` parameters that allow more control over how the site footer is displayed ([#192](https://github.com/jpanther/congo/discussions/192)) +- `bars` SVG icon ### Changed diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index c7633db6..7e0d9ddd 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1015,6 +1015,22 @@ body button { display: none; } +/* Hamburger menu */ + +body:has(#menu-controller:checked) { + position: fixed; + overflow-y: scroll; +} + +#menu-button:has(#menu-controller:checked) { + visibility: hidden; +} + +#menu-controller:checked ~ #menu-wrapper { + visibility: visible; + opacity: 1; +} + /* RTL support */ [dir="rtl"] .prose blockquote { @@ -1706,6 +1722,14 @@ body button { z-index: 10; } +.z-40 { + z-index: 40; +} + +.z-30 { + z-index: 30; +} + .order-first { order: -9999; } @@ -1748,6 +1772,11 @@ body button { margin-bottom: 0px; } +.mx-4 { + margin-left: 1rem; + margin-right: 1rem; +} + .mb-3 { margin-bottom: 0.75rem; } @@ -2015,6 +2044,10 @@ body button { overflow: hidden; } +.overflow-visible { + overflow: visible; +} + .scroll-smooth { scroll-behavior: smooth; } @@ -2118,6 +2151,10 @@ body button { background-color: rgba(var(--color-primary-600), var(--tw-bg-opacity)); } +.bg-neutral-100\/50 { + background-color: rgba(var(--color-neutral-100), 0.5); +} + .object-scale-down { -o-object-fit: scale-down; object-fit: scale-down; @@ -2849,6 +2886,10 @@ body button { padding-bottom: 2.5rem; } + .sm\:pt-10 { + padding-top: 2.5rem; + } + .sm\:text-lg { font-size: 1.125rem; line-height: 1.75rem; diff --git a/assets/css/main.css b/assets/css/main.css index 7285f736..c1ce3339 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -21,6 +21,17 @@ body button { @apply hidden; } +/* Hamburger menu */ +body:has(#menu-controller:checked) { + @apply fixed overflow-y-scroll; +} +#menu-button:has(#menu-controller:checked) { + @apply invisible; +} +#menu-controller:checked ~ #menu-wrapper { + @apply visible opacity-100; +} + /* RTL support */ .prose blockquote { @apply rtl:pr-4 rtl:border-l-0 rtl:border-r-4; diff --git a/assets/icons/bars.svg b/assets/icons/bars.svg new file mode 100644 index 00000000..6e5941da --- /dev/null +++ b/assets/icons/bars.svg @@ -0,0 +1 @@ + diff --git a/config/_default/params.toml b/config/_default/params.toml index 1f9bcf8a..bcdfd4d8 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -15,6 +15,9 @@ enableCodeCopy = false # mainSections = ["section1", "section2"] # robots = "" +[header] + layout = "basic" # valid options: basic, hamburger, custom + [footer] showCopyright = true showThemeAttribution = true diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 5ce3dc2b..07579abe 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -15,6 +15,9 @@ enableCodeCopy = true mainSections = ["samples"] # robots = "" +[header] + layout = "basic" # valid options: basic, hamburger, custom + [footer] showCopyright = true showThemeAttribution = true diff --git a/exampleSite/content/docs/configuration.md b/exampleSite/content/docs/configuration.md index a692026d..4b3b0d48 100644 --- a/exampleSite/content/docs/configuration.md +++ b/exampleSite/content/docs/configuration.md @@ -121,6 +121,7 @@ Many of the article defaults here can be overridden on a per article basis by sp |`logo`|_Not set_|The relative path to the site logo file within the `assets/` folder. The logo file should be provided at 2x resolution and supports any image dimensions.| |`mainSections`|_Not set_|The sections that should be displayed in the recent articles list. If not provided the section with the greatest number of articles is used.| |`robots`|_Not set_|String that indicates how robots should handle your site. If set, it will be output in the page head. Refer to [Google's docs](https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives) for valid values.| +|`header.layout`|`"basic"`|The layout of the page header and menu. Valid values are `basic`, `hamburger` or `custom`. When set to `custom`, you must provide your own layout by creating a `/layouts/partials/header/custom.html` file.| |`footer.showCopyright`|`true`|Whether or not to show the copyright string in the site footer. Note that the string itself can be customised using the `copyright` parameter in the [languages configuration](#language-and-i18n).| |`footer.showThemeAttribution`|`true`|Whether or not to show the "powered by" theme attribution in the site footer. If you choose to disable this message, please consider attributing the theme somewhere else on your site (for example, on your about page).| |`footer.showAppearanceSwitcher`|`false`|Whether or not to show the appearance switcher in the site footer. The browser's local storage is used to persist the visitor's preference.| diff --git a/exampleSite/content/samples/icons.md b/exampleSite/content/samples/icons.md index 1559a393..f55c058d 100644 --- a/exampleSite/content/samples/icons.md +++ b/exampleSite/content/samples/icons.md @@ -19,6 +19,7 @@ The full list of built-in icons and their corresponding names can referenced bel | -------------------- | --------------------------------- | | amazon | {{< icon amazon >}} | | apple | {{< icon apple >}} | +| bars | {{< icon bars >}} | | blogger | {{< icon blogger >}} | | bug | {{< icon bug >}} | | check | {{< icon check >}} | diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 3e80305f..86baac14 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -25,7 +25,12 @@ >{{ i18n "nav.skip_to_main" }}
- {{- partial "header.html" . -}} + {{ $header := print "partials/header/" .Site.Params.header.layout ".html" }} + {{ if templates.Exists $header }} + {{ partial $header . }} + {{ else }} + {{ partial "partials/header/basic.html" . }} + {{ end }}
{{ block "main" . }}{{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html deleted file mode 100644 index fec98296..00000000 --- a/layouts/partials/header.html +++ /dev/null @@ -1,63 +0,0 @@ -
- {{/* Site logo/title */}} -
- {{ if .Site.Params.Logo -}} - {{ $logo := resources.Get .Site.Params.Logo }} - {{ if $logo }} - - {{ .Site.Title }} - - {{ end }} - {{ else }} - {{ .Site.Title | markdownify | emojify }} - {{- end }} - {{ partial "translations.html" . }} -
- {{/* Main menu */}} - {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }} - - {{ end }} -
diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html new file mode 100644 index 00000000..bb214f57 --- /dev/null +++ b/layouts/partials/header/basic.html @@ -0,0 +1,57 @@ +
+ +
diff --git a/layouts/partials/header/hamburger.html b/layouts/partials/header/hamburger.html new file mode 100644 index 00000000..d28f98ca --- /dev/null +++ b/layouts/partials/header/hamburger.html @@ -0,0 +1,75 @@ +
+ +
diff --git a/layouts/partials/translations.html b/layouts/partials/translations.html index 001e38cd..e4724e3e 100644 --- a/layouts/partials/translations.html +++ b/layouts/partials/translations.html @@ -1,7 +1,7 @@ {{ if .IsTranslated }} - +
{{ end }} From a8f98205c9646b2aee0fdb3765c8313dd56e1c65 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 27 Jun 2022 13:12:26 +1000 Subject: [PATCH 18/20] =?UTF-8?q?=F0=9F=A5=85=20Add=20build=20warning=20wh?= =?UTF-8?q?en=20old=20theme=20params=20found?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/_default/baseof.html | 1 + layouts/partials/functions/warnings.html | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 layouts/partials/functions/warnings.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 86baac14..b9a6a22d 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,3 +1,4 @@ +{{- partial "partials/functions/warnings.html" .Site -}} Date: Mon, 27 Jun 2022 13:12:55 +1000 Subject: [PATCH 19/20] =?UTF-8?q?=F0=9F=93=9D=20Update=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #230 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b022e5f5..5503445d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Fixed +- Hugo v0.101.0 breaks the link to the homepage ([#230](https://github.com/jpanther/congo/issues/230)) - Search link does not appear in header if main menu has no items to display - Search only returns results in the primary language when multiple languages are available ([#229](https://github.com/jpanther/congo/issues/229)) - Arrow on external article links not aligned correctly when title wraps onto multiple lines From c89201e7c75d2d4853a9eb7d55ceec8d34e24bbb Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Mon, 27 Jun 2022 13:18:18 +1000 Subject: [PATCH 20/20] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.3?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- assets/css/compiled/main.css | 2 +- assets/css/main.css | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5503445d..07fe4efb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [2.3.0] - 2022-06-27 + ### Added - Header layouts for selecting a preferred header style @@ -483,7 +485,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Advanced customisation using simple Tailwind colour definitions and styles - Fully documented -[unreleased]: https://github.com/jpanther/congo/compare/v2.2.3...HEAD +[unreleased]: https://github.com/jpanther/congo/compare/v2.3.0...HEAD +[2.3.0]: https://github.com/jpanther/congo/compare/v2.2.3...v2.3.0 [2.2.3]: https://github.com/jpanther/congo/compare/v2.2.2...v2.2.3 [2.2.2]: https://github.com/jpanther/congo/compare/v2.2.1...v2.2.2 [2.2.1]: https://github.com/jpanther/congo/compare/v2.2.0...v2.2.1 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 7e0d9ddd..998714b5 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.2.3 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.3.0 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v3.1.4 | MIT License | https://tailwindcss.com */ diff --git a/assets/css/main.css b/assets/css/main.css index c1ce3339..7cc40e36 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.2.3 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.3.0 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/package.json b/package.json index 9cd3f2b8..693d06a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "2.2.3", + "version": "2.3.0", "description": "Congo theme for Hugo", "scripts": { "preinstall": "rimraf assets/vendor",