diff --git a/layouts/_default/single.html b/layouts/_default/single.html index a94aa77..eaa25b1 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,10 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
-
- {{ .Content }} -
+
+
+ {{ partial "headline-hash.html" .Content }} +
{{ partial "footer.html" . }} diff --git a/layouts/page/single.html b/layouts/page/single.html deleted file mode 100644 index 4af3235..0000000 --- a/layouts/page/single.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ partial "header.html" . }} -{{ partial "navbar.html" . }} - -
-
- {{ partial "headline-hash.html" .Content }} -
-
- -{{ partial "footer.html" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8207659..aeb4191 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -62,4 +62,4 @@ - + diff --git a/layouts/partials/headline-hash.html b/layouts/partials/headline-hash.html index 05aadf6..313c07a 100644 --- a/layouts/partials/headline-hash.html +++ b/layouts/partials/headline-hash.html @@ -1 +1 @@ -{{ . | replaceRE "()" "${1} # ${3}" | safeHTML }} +{{ . | replaceRE "()" "${1} # ${3}" | safeHTML }} diff --git a/layouts/post/single.html b/layouts/post/single.html index 861ea65..8d3ce64 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,7 +1,7 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
+

diff --git a/package.json b/package.json index d78be6c..edadcd1 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "watch": "tailwindcss -i src/style.css -o static/css/styles.css --watch" }, "devDependencies": { + "@tailwindcss/typography": "^0.5.0", "postcss": "^8.4.5", "tailwindcss": "^3.0.17" } diff --git a/tailwind.config.js b/tailwind.config.js index 4ceb312..198e677 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,7 +4,15 @@ module.exports = { './layouts/**/*.html' ], theme: { - extend: {}, + extend: { + colors: { + primary: { + DEFAULT: '#196aff', + } + } + }, }, - plugins: [], + plugins: [ + require('@tailwindcss/typography'), + ], } diff --git a/yarn.lock b/yarn.lock index 7c20f39..ebd6a12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -44,6 +44,16 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@tailwindcss/typography@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.0.tgz#47886ec46ac41e1211d24fea05301046d9b30906" + integrity sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA== + dependencies: + lodash.castarray "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.merge "^4.6.2" + lodash.uniq "^4.5.0" + "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -355,6 +365,26 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +lodash.castarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"