From 24f989109af9dd016c277c819fcafe8cf3dd41b3 Mon Sep 17 00:00:00 2001 From: Pavel Mineev Date: Sun, 10 Oct 2021 14:32:17 +0300 Subject: [PATCH] restore pricavy policy, add footer --- site/.eleventy.js | 1 + site/package.json | 8 +-- site/src/includes/components/footer.njk | 4 +- site/src/layouts/base.njk | 6 +- site/src/layouts/demo.njk | 2 +- site/src/layouts/page.njk | 4 +- site/src/pages/privacy.md | 73 +++++++++++++++++++++++++ 7 files changed, 88 insertions(+), 10 deletions(-) diff --git a/site/.eleventy.js b/site/.eleventy.js index 94a9b486..579e8cf7 100644 --- a/site/.eleventy.js +++ b/site/.eleventy.js @@ -49,6 +49,7 @@ function getMarkdownLib() { module.exports = function (eleventyConfig) { // TODO: create version with commit sha and current version of Remark42 eleventyConfig.addShortcode('version', () => `${Date.now()}`) + eleventyConfig.addShortcode('year', () => `${new Date().getFullYear()}`) eleventyConfig.setUseGitIgnore(false) eleventyConfig.addWatchTarget('./.tmp/style.css') eleventyConfig.addPassthroughCopy({ './.tmp/style.css': './style.css' }) diff --git a/site/package.json b/site/package.json index 4a352540..9f235830 100644 --- a/site/package.json +++ b/site/package.json @@ -11,11 +11,11 @@ "yarn": ">=1.22" }, "scripts": { - "dev": "npm run clean && npm run dev:css | npm run dev:11ty", - "dev:css": "postcss ./src/styles.css -o .tmp/style.css -w", - "dev:11ty": "eleventy --serve --watch", + "dev": "npm-run-all -l clean -p dev:css dev:11ty", + "dev:css": "tailwindcss -i ./src/styles.css -o .tmp/style.css -w", + "dev:11ty": "eleventy --serve --watch --quiet", "build": "cross-env NODE_ENV=production run-s clean build:* --print-label", - "build:css": "postcss ./src/styles.css -o .tmp/style.css", + "build:css": "tailwindcss -i ./src/styles.css -o .tmp/style.css", "build:11ty": "eleventy", "clean": "rm -rf .tmp/* build/*" }, diff --git a/site/src/includes/components/footer.njk b/site/src/includes/components/footer.njk index f455e3fc..6f5928ba 100644 --- a/site/src/includes/components/footer.njk +++ b/site/src/includes/components/footer.njk @@ -1 +1,3 @@ - + diff --git a/site/src/layouts/base.njk b/site/src/layouts/base.njk index b4277996..b1dfc61d 100644 --- a/site/src/layouts/base.njk +++ b/site/src/layouts/base.njk @@ -1,9 +1,9 @@ - + {% include "components/head.njk" %} - + {% include "components/header.njk" %} -
+
{{ layoutContent | safe }}
{% include "components/footer.njk" %} diff --git a/site/src/layouts/demo.njk b/site/src/layouts/demo.njk index 4a6eeaeb..d331d94d 100644 --- a/site/src/layouts/demo.njk +++ b/site/src/layouts/demo.njk @@ -4,7 +4,7 @@ layout: page.njk {{ content | safe }} -
+