[taler-taler-ops-www] branch master updated: proper font loading, no sass build step

[gnunet]

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

nora pushed a commit to branch master
in repository taler-ops-www.

The following commit(s) were added to refs/heads/master by this push:
     new 9d1d995  proper font loading, no sass build step
9d1d995 is described below

commit 9d1d995df569b47b4aa029bbd7ece45d9d6fe023
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sun Feb 25 01:19:15 2024 +0100

    proper font loading, no sass build step
---
 Makefile               |  4 +---
 common/header.j2.inc   |  6 +++---
 package.json           |  4 ++--
 pnpm-lock.yaml         | 14 ++++++++++++++
 static/scss/fonts.scss |  4 ++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 5a19698..cd7e283 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ include build-system/config.mk
 
 # All: build HTML pages in all languages.
 .PHONY: all
-all: build-site build-css optimize-css parcel
+all: build-site parcel optimize-css
 
 # build-unoptimized: Builds without optimizing CSS as to allow for faster 
testing
 build-unoptimized: build-site build-css parcel-no-optimize
@@ -13,8 +13,6 @@ build-site:
        ./inc/update-messages
        env "BASEURL=$(opt_baseurl)" ./inc/build-site
 
-build-css:
-       ./build-system/pkgmgr run build-css;
 optimize-css:
        ./build-system/pkgmgr run optimize-css;
 
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 01ee66f..7e75b07 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -44,6 +44,6 @@
 <script src="{{ url_static('js/jquerymin.js') }}"></script>
 <script src="{{ url_static('js/toggle.js') }}" defer></script>
 
-<link href="{{ url_static('css/bootstrap5.css') }}" rel="stylesheet" />
-<link href="{{ url_static('css/doc.css') }}" rel="stylesheet" />
-<link href="{{ url_static('css/fonts.css') }}" rel="stylesheet" />
+<link href="{{ url_static('scss/bootstrap5.scss') }}" rel="stylesheet" />
+<link href="{{ url_static('scss/doc.scss') }}" rel="stylesheet" />
+<link href="{{ url_static('scss/fonts.scss') }}" rel="stylesheet" />
diff --git a/package.json b/package.json
index 1337718..6da2499 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,7 @@
   "name": "taler-ops-www",
   "description": "Taler Operations WWW",
   "scripts": {
-    "build-css": "sass rendered/scss:rendered/css",
-    "optimize-css": "for file in rendered/css/*.css; do purifycss $file 
'rendered/**/*.html' -m -i -o $file.pure.css; mv $file.pure.css $file;done;",
+    "optimize-css": "for file in dist/css/*.css; do purifycss $file 
'dist/**/*.html' -m -i -o $file.pure.css; mv $file.pure.css $file;done;",
     "prepare-parcel": "rm -f rendered/index.html && for file in 
rendered/**/*.html; do echo \"<a href='$file'>...</a>\" >> rendered/index.html; 
done; sed -i 's/rendered/./g' rendered/index.html",
     "build-parcel": "parcel build rendered/index.html --public-url 
BASE_URL_RELATIVE_TO_FILE",
     "build-parcel-no-optimize": "parcel build rendered/index.html --public-url 
BASE_URL_RELATIVE_TO_FILE --no-optimize",
@@ -14,6 +13,7 @@
   "devDependencies": {
     "@parcel/config-default": "^2.11.0",
     "@parcel/plugin": "^2.11.0",
+    "@parcel/transformer-sass": "2.11.0",
     "parcel": "^2.11.0",
     "purify-css": "^1.2.5",
     "sass": "^1.71.1"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1024859..3206776 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,6 +11,9 @@ devDependencies:
   '@parcel/plugin':
     specifier: ^2.11.0
     version: 2.11.0(@parcel/core@2.11.0)
+  '@parcel/transformer-sass':
+    specifier: 2.11.0
+    version: 2.11.0(@parcel/core@2.11.0)
   parcel:
     specifier: ^2.11.0
     version: 2.11.0
@@ -787,6 +790,17 @@ packages:
       - '@parcel/core'
     dev: true
 
+  /@parcel/transformer-sass@2.11.0(@parcel/core@2.11.0):
+    resolution: {integrity: 
sha512-caVIj1UANPgtlZOXcsBrQ++ouAy04hcq+wTwxJrf5t3XA4pdXQmkiLs5WIIUUGBp5hwkV6/BSwc4ht87MunA0g==}
+    engines: {node: '>= 12.0.0', parcel: ^2.11.0}
+    dependencies:
+      '@parcel/plugin': 2.11.0(@parcel/core@2.11.0)
+      '@parcel/source-map': 2.1.1
+      sass: 1.71.1
+    transitivePeerDependencies:
+      - '@parcel/core'
+    dev: true
+
   /@parcel/transformer-svg@2.11.0(@parcel/core@2.11.0):
     resolution: {integrity: 
sha512-GrTNi04OoQSXsyrB7FqQPeYREscEXFhIBPkyQ0q7WDG/yYynWljiA0kwITCtMjPfv2EDVks292dvM3EcnERRIA==}
     engines: {node: '>= 12.0.0', parcel: ^2.11.0}
diff --git a/static/scss/fonts.scss b/static/scss/fonts.scss
index 93a1a39..06474be 100644
--- a/static/scss/fonts.scss
+++ b/static/scss/fonts.scss
@@ -1,2 +1,2 @@
-@use './fonts/roboto/roboto.css';
-@use './fonts/montserrat/montserrat.css';
+@import url('./fonts/roboto/roboto.css');
+@import url('./fonts/montserrat/montserrat.css');

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.