[tor-commits] [bridgedb] 02/07: Use lektor-scss to build the SCSS during the lektor site build

[gitolite role]

This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main
in repository bridgedb.

commit 79ad6f2d71a767778773a2a8d2b303e0ef9d0c63
Author: kez <kez at torproject.org>
AuthorDate: Wed Aug 24 15:15:25 2022 -0700

    Use lektor-scss to build the SCSS during the lektor site build
    
    Fixes broken CSS on the production site
---
 frontend/.gitignore                                     | 2 ++
 frontend/assets/scss/{bootstrap.scss => _includes.scss} | 0
 frontend/assets/scss/bootstrap.scss                     | 3 ++-
 frontend/assets/static/css                              | 1 -
 frontend/assets/static/css/digital-climate-strike       | 1 +
 frontend/assets/static/css/images                       | 1 +
 frontend/build.sh                                       | 2 +-
 frontend/configs/scss.ini                               | 2 ++
 8 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/.gitignore b/frontend/.gitignore
index a82e424..0f85329 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -1,3 +1,5 @@
+assets/static/css/*.css
+
 node_modules
 
 .sass-cache
diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/_includes.scss
similarity index 100%
copy from frontend/assets/scss/bootstrap.scss
copy to frontend/assets/scss/_includes.scss
diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/bootstrap.scss
deleted file mode 120000
index e655926..0000000
--- a/frontend/assets/scss/bootstrap.scss
+++ /dev/null
@@ -1 +0,0 @@
-../../lego/assets/scss/bootstrap.scss
\ No newline at end of file
diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/bootstrap.scss
new file mode 100644
index 0000000..f5b3ffc
--- /dev/null
+++ b/frontend/assets/scss/bootstrap.scss
@@ -0,0 +1,2 @@
+ at import "includes";
+ at import "bridges";
diff --git a/frontend/assets/static/css b/frontend/assets/static/css
deleted file mode 120000
index 12e4567..0000000
--- a/frontend/assets/static/css
+++ /dev/null
@@ -1 +0,0 @@
-../../lego/assets/static/css
\ No newline at end of file
diff --git a/frontend/assets/static/css/digital-climate-strike b/frontend/assets/static/css/digital-climate-strike
new file mode 120000
index 0000000..b910197
--- /dev/null
+++ b/frontend/assets/static/css/digital-climate-strike
@@ -0,0 +1 @@
+../../../lego/assets/static/css/digital-climate-strike/
\ No newline at end of file
diff --git a/frontend/assets/static/css/images b/frontend/assets/static/css/images
new file mode 120000
index 0000000..227bf12
--- /dev/null
+++ b/frontend/assets/static/css/images
@@ -0,0 +1 @@
+../../../lego/assets/static/css/images/
\ No newline at end of file
diff --git a/frontend/build.sh b/frontend/build.sh
index 2781682..6e6323b 100755
--- a/frontend/build.sh
+++ b/frontend/build.sh
@@ -28,7 +28,7 @@ then
     git clone https://gitlab.torproject.org/tpo/translation/ --single-branch --branch=bridgedb i18n
 fi
 
-lektor build -O public_tmp
+lektor build -O public_tmp -f scss
 rm -rf public
 mkdir public
 
diff --git a/frontend/configs/scss.ini b/frontend/configs/scss.ini
new file mode 100644
index 0000000..e9bd5f5
--- /dev/null
+++ b/frontend/configs/scss.ini
@@ -0,0 +1,2 @@
+output_dir = assets/static/css
+output_style = compact

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.