From 57b426f34b8448145d777f94e9d11920dd5c4ef5 Mon Sep 17 00:00:00 2001 From: kez Date: Tue, 24 Jan 2023 19:29:54 -0800 Subject: [PATCH] Use lektor-scss to build scss Context: tpo/web/lego#55 --- .gitignore | 2 ++ .gitlab-ci.yml | 1 + .gitmodules | 3 +++ assets/static/css | 1 - configs/scss.ini | 2 ++ lego | 2 +- packages/lektor-scss | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) delete mode 120000 assets/static/css create mode 100644 configs/scss.ini create mode 160000 packages/lektor-scss diff --git a/.gitignore b/.gitignore index 26a36b8..28a1897 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +assets/static/css + node_modules venv .sass-cache diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61cd0d9..2e30578 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ --- variables: + LEKTOR_BUILD_FLAGS: scss SITE_URL: newsletter.torproject.org STAGING_URL: newsletter.staging.torproject.net diff --git a/.gitmodules b/.gitmodules index 4807542..28b1a82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lego"] path = lego url = https://gitlab.torproject.org/tpo/web/lego.git +[submodule "packages/lektor-scss"] + path = packages/lektor-scss + url = https://gitlab.torproject.org/tpo/web/lektor-scss/ diff --git a/assets/static/css b/assets/static/css deleted file mode 120000 index 12e4567..0000000 --- a/assets/static/css +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/static/css \ No newline at end of file diff --git a/configs/scss.ini b/configs/scss.ini new file mode 100644 index 0000000..88bc9df --- /dev/null +++ b/configs/scss.ini @@ -0,0 +1,2 @@ +output_dir = assets/static/css +output_style = compressed diff --git a/lego b/lego index 5bd7190..b7b2a6f 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 5bd7190739baa1bbbb1eae39081bdd1752e2225e +Subproject commit b7b2a6f1f0a0bf03917c0dcc341c0dcf3d0b04a5 diff --git a/packages/lektor-scss b/packages/lektor-scss new file mode 160000 index 0000000..de36235 --- /dev/null +++ b/packages/lektor-scss @@ -0,0 +1 @@ +Subproject commit de36235b56f68f6dc154212a3c0dcf5cc8fdabda