Copy contrasting font experimentation

.pre-commit-config.yaml

@@ -5,6 +5,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.ci for more information
 ci:
+  skip: [pnpm-prettier]
   # I don't need so many duplicated notifications on the same thing as I keep
   # autoupdating manually too. Besides it just creates extra branch I never
   # touch.
@@ -39,6 +40,11 @@ repos:
       - id: pretty-format-json
         args: [--autofix, --no-ensure-ascii]
 
+  - repo: https://github.com/pre-commit/sync-pre-commit-deps
+    rev: v0.0.1
+    hooks:
+      - id: sync-pre-commit-deps
+
   - repo: https://github.com/pre-commit-ci/pre-commit-ci-config
     rev: v1.6.1
     hooks:
@@ -48,7 +54,7 @@ repos:
     rev: v2.2.0
     hooks:
       - id: doctoc
-        args: [--update-only, --notitle]
+        args: [--update-only, --no-title]
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.28.4
@@ -57,22 +63,26 @@ repos:
       - id: check-github-workflows
       - id: check-gitlab-ci
 
-  # - repo: https://github.com/fsfe/reuse-tool
+  # - repo: https://github.com/rbubley/mirrors-prettier
-  #   rev: v3.0.2
+  #   rev: "v3.3.1"
   #   hooks:
-  #     - id: reuse
+  #     - id: prettier
+  #       additional_dependencies: [
+  #           # https://www.npmjs.com/package/prettier
+  #           "prettier@3.3.1",
+  #           # https://www.npmjs.com/package/@prettier/plugin-xml
+  #           "@prettier/plugin-xml@3.4.1",
+  #         ]
 
-  - repo: https://github.com/rbubley/mirrors-prettier
+  - repo: local
-    rev: "v3.3.0"
     hooks:
-      - id: prettier
+      - id: pnpm-prettier
+        name: prettier
+        entry: pnpm exec prettier --cache --ignore-unknown --write
+        language: system
+        # Better handled by pretty-format-json from pre-commit-hooks.
+        # Remember to have *.json in .prettierignore!
         exclude_types: [json]
-        additional_dependencies: [
-            # https://www.npmjs.com/package/prettier
-            "prettier@3.2.5",
-            # https://www.npmjs.com/package/@prettier/plugin-xml
-            "@prettier/plugin-xml@3.4.1",
-          ]
 
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: "2.7.3"

.prettierignore

@@ -1,2 +1,5 @@
 # Prettier cannot handle Jekyll variables?
 _includes
+_layouts
+blog/*.xml
+*.json

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "plugins": ["@prettier/plugin-xml", "prettier-plugin-sh"],
+  "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }]
+}

Gemfile.lock

@@ -5,29 +5,38 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
     forwardable-extended (2.6.0)
-    google-protobuf (4.27.0)
+    google-protobuf (4.27.1)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-aarch64-linux)
+    google-protobuf (4.27.1-aarch64-linux)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-arm64-darwin)
+    google-protobuf (4.27.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86-linux)
+    google-protobuf (4.27.1-x86-linux)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86_64-darwin)
+    google-protobuf (4.27.1-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86_64-linux)
+    google-protobuf (4.27.1-x86_64-linux)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
@@ -85,25 +94,25 @@ GEM
       strscan (>= 3.0.9)
     rouge (4.2.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.77.2-aarch64-linux-gnu)
+    sass-embedded (1.77.4-aarch64-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-aarch64-linux-musl)
+    sass-embedded (1.77.4-aarch64-linux-musl)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-arm-linux-gnueabihf)
+    sass-embedded (1.77.4-arm-linux-gnueabihf)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-arm-linux-musleabihf)
+    sass-embedded (1.77.4-arm-linux-musleabihf)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-arm64-darwin)
+    sass-embedded (1.77.4-arm64-darwin)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-x86-linux-gnu)
+    sass-embedded (1.77.4-x86-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-x86-linux-musl)
+    sass-embedded (1.77.4-x86-linux-musl)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-x86_64-darwin)
+    sass-embedded (1.77.4-x86_64-darwin)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-x86_64-linux-gnu)
+    sass-embedded (1.77.4-x86_64-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.2-x86_64-linux-musl)
+    sass-embedded (1.77.4-x86_64-linux-musl)
       google-protobuf (>= 3.25, < 5.0)
     strscan (3.1.0)
     terminal-table (3.0.2)

README.md

@@ -5,7 +5,7 @@ layout: default
 versionString: 2024.22.2
 date: 2024-05-28T08:59:32+03:00
 lang: en
-locale: en_US
+locale: en_FI
 permalink: /en/index.html
 redirect_from: /en/html
 robots: noai, nofollow
@@ -15,7 +15,7 @@ robots: noai, nofollow
 
 <img src="https://media.githubusercontent.com/media/Mikaela/mikaela.github.io/lfs-media/avatar/250.jpeg" alt="photo of me"/>
 
-_…is an open-source enthustiastic volunteer sysadmin in the Pirate Party of Finland._
+<span id="bio">_…is an open-source enthustiastic volunteer sysadmin in the Pirate Party of Finland._</span>
 
 <p style="text-align: center;">&#127987;&#65039;&#8205;&#9895;&#8203;&#8205;&#127987;&#65039;&#8205;&#127752;&#65039;</p>
 

assets/main.scss

@@ -4,14 +4,15 @@
 
 @charset "utf-8";
 
-// Apparently my Android understands system-ui, but not ui-serif, so for the
+// Our variables
-// best experience, I will permit fallback, even if it will be sans-serif.
+$serif-font-family: ui-serif, "Liberation Serif", Tinos, "Times New Roman",
-// I imagine it's a small minority and most users will get either ui-serif
+  serif, emoji;
-// or fallback further down the fallback list, perhaps all the way to serif.
+$sans-serif-font-family: ui-sans-serif, "Liberation Sans", "Arimo", "Arial",
-$base-font-family: ui-serif, system-ui, "Liberation Serif", Tinos,
+  sans-serif;
-  "Times New Roman", serif, emoji;
 $monospace-font-family: ui-monospace, "Liberation Mono", Cousine,
   "Courier New", monospace, emoji;
+// Must be in the end or undefined error.
+$base-font-family: $serif-font-family;
 
 @import "{{ site.theme }}";
 
@@ -39,11 +40,38 @@ a {
   text-decoration: underline !important;
 }
 
-pre,
+a.site-title {
+  font-family: $serif-font-family;
+}
+
+// Monospace preferred for code
+code,
+pre {
+  font-family: $monospace-font-family !important;
+}
+
+// So it will not look bigger than normal text
 code {
   font-size: 0.8em !important;
 }
 
+// Sans-Serif for headings to constrast with aminda.eu
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: $sans-serif-font-family !important;
+}
+
+// The introduction on top
+#bio {
+  text-align: center;
+  font-style: italic;
+  font-family: ui-cursive, $serif-font-family;
+}
+
 img {
   border-radius: 50% !important;
   display: block;

fi/README.md

@@ -20,7 +20,7 @@ robots: nofollow, noai
 
 <img src="https://media.githubusercontent.com/media/Mikaela/mikaela.github.io/lfs-media/avatar/250.jpeg" alt="kuva minusta"/>
 
-_…on avointa lähdekoodia tukeva verkkopalveluylläpitäjä piraattipuolueessa._
+<span id="bio">_…on avointa lähdekoodia tukeva verkkopalveluylläpitäjä piraattipuolueessa._</span>
 
 <p style="text-align: center;">&#127987;&#65039;&#8205;&#9895;&#8203;&#8205;&#127987;&#65039;&#8205;&#127752;&#65039;</p>
 

package.json

@@ -1,5 +1,7 @@
 {
   "devDependencies": {
-    "prettier": "3.3.0"
+    "@prettier/plugin-xml": "3.4.1",
+    "prettier": "3.3.1",
+    "prettier-plugin-sh": "0.14.0"
   }
 }

pnpm-lock.yaml

@@ -7,18 +7,107 @@ settings:
 importers:
   .:
     devDependencies:
+      "@prettier/plugin-xml":
+        specifier: 3.4.1
+        version: 3.4.1(prettier@3.3.1)
       prettier:
-        specifier: 3.3.0
+        specifier: 3.3.1
-        version: 3.3.0
+        version: 3.3.1
+      prettier-plugin-sh:
+        specifier: 0.14.0
+        version: 0.14.0(prettier@3.3.1)
 
 packages:
-  prettier@3.3.0:
+  "@prettier/plugin-xml@3.4.1":
     resolution:
       {
-        integrity: sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==,
+        integrity: sha512-Uf/6/+9ez6z/IvZErgobZ2G9n1ybxF5BhCd7eMcKqfoWuOzzNUxBipNo3QAP8kRC1VD18TIo84no7LhqtyDcTg==,
+      }
+    peerDependencies:
+      prettier: ^3.0.0
+
+  "@xml-tools/parser@1.0.11":
+    resolution:
+      {
+        integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==,
+      }
+
+  chevrotain@7.1.1:
+    resolution:
+      {
+        integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==,
+      }
+
+  mvdan-sh@0.10.1:
+    resolution:
+      {
+        integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==,
+      }
+
+  prettier-plugin-sh@0.14.0:
+    resolution:
+      {
+        integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==,
+      }
+    engines: { node: ">=16.0.0" }
+    peerDependencies:
+      prettier: ^3.0.3
+
+  prettier@3.3.1:
+    resolution:
+      {
+        integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==,
       }
     engines: { node: ">=14" }
     hasBin: true
 
+  regexp-to-ast@0.5.0:
+    resolution:
+      {
+        integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
+      }
+
+  sh-syntax@0.4.2:
+    resolution:
+      {
+        integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
+      }
+    engines: { node: ">=16.0.0" }
+
+  tslib@2.6.3:
+    resolution:
+      {
+        integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==,
+      }
+
 snapshots:
-  prettier@3.3.0: {}
+  "@prettier/plugin-xml@3.4.1(prettier@3.3.1)":
+    dependencies:
+      "@xml-tools/parser": 1.0.11
+      prettier: 3.3.1
+
+  "@xml-tools/parser@1.0.11":
+    dependencies:
+      chevrotain: 7.1.1
+
+  chevrotain@7.1.1:
+    dependencies:
+      regexp-to-ast: 0.5.0
+
+  mvdan-sh@0.10.1: {}
+
+  prettier-plugin-sh@0.14.0(prettier@3.3.1):
+    dependencies:
+      mvdan-sh: 0.10.1
+      prettier: 3.3.1
+      sh-syntax: 0.4.2
+
+  prettier@3.3.1: {}
+
+  regexp-to-ast@0.5.0: {}
+
+  sh-syntax@0.4.2:
+    dependencies:
+      tslib: 2.6.3
+
+  tslib@2.6.3: {}