Replace external fonts with self-hosted

.github/workflows/pages.yml

@@ -0,0 +1,81 @@
+name: Build and deploy site
+
+# Replaces the classic "deploy from a branch" GitHub Pages build, which pins
+# jekyll-sass-converter 1.5.2 + Ruby Sass 3.7.4 and cannot compile styles/scss.
+# Repository setting required: Settings > Pages > Source = "GitHub Actions".
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one deploy at a time; do not cancel a run that is already publishing.
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+
+      # Jekyll aborts on malformed _data YAML, but with a bare Psych backtrace.
+      # Check first so the failure names the file and line.
+      - name: Validate data files
+        run: |
+          ruby -ryaml -e '
+            ok = true
+            Dir["docs/_data/*.{yml,yaml}"].sort.each do |f|
+              begin
+                YAML.unsafe_load_file(f)
+                puts "ok   #{f}"
+              rescue => e
+                warn "FAIL #{f}: #{e.class}: #{e.message}"
+                ok = false
+              end
+            end
+            exit(ok ? 0 : 1)
+          '
+
+      - name: Build site
+        env:
+          JEKYLL_ENV: production
+        run: bundle exec jekyll build --source docs --destination _site --trace
+
+      - name: Check generated stylesheets and fonts
+        run: |
+          set -e
+          test -s _site/styles/css/style.css
+          test -s _site/styles/css/style_for_ie.css
+          # Every @font-face URL must resolve to a file that was actually built.
+          grep -o "url(\"[^\"]*\.woff2\")" _site/styles/css/style.css \
+            | sed 's/^url("//; s/")$//' \
+            | while read -r ref; do
+                path=$(realpath -m "_site/styles/css/$ref")
+                test -f "$path" || { echo "Missing font target: $ref"; exit 1; }
+              done
+
+      - uses: actions/upload-pages-artifact@v3
+
+  deploy:
+    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -309,4 +309,19 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk
+
+.nova/
+
+# Jekyll build output
+docs/_site/
+docs/.jekyll-cache/
+docs/.jekyll-metadata
+_site/
+
+# Sass output (generated by Jekyll from docs/styles/scss)
+docs/styles/css/
+
+# Bundler
+.bundle/
+vendor/bundle/

Gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+# Jekyll 4 is required so that Sass is compiled by Dart Sass (via
+# jekyll-sass-converter 3.x / sass-embedded). The classic GitHub Pages build
+# pins jekyll-sass-converter 1.5.2 + Ruby Sass 3.7.4, which cannot parse the
+# Sass module system (@use, color.adjust) used in styles/scss.
+gem "jekyll", "~> 4.4"
+
+# Needed to run `jekyll serve` on Ruby 3.x (webrick left the stdlib in 3.0).
+gem "webrick", "~> 1.9"

docs/_config.yml

@@ -6,15 +6,20 @@ title:               Battery Intelligence Lab
 tagline:             'Energy storage systems'
 description:         'A research group focused on system design, monitoring and control of electrochemical energy storage systems in applications from electric cars to grid power systems.'
 baseurl:             ''
-# baseurl:             ''
 
 # About/contact
 author:
   name:              Dan Lovell
-  url:               http://danlovell.com
+  url:               https://danlovell.com
 
 # Encoding
 encoding:            utf-8
 
 # Custom vars
-version:             1.1.2
+version:             1.2.0
+
+# Sass
+sass:
+  sass_dir:           styles/scss
+  style:              compressed
+  sourcemap:          never

docs/_data/people.yml

@@ -22,7 +22,7 @@
     image: 'Christopher-Wett.jpg'
     bio: Christopher is interested in battery modelling, management, and diagnostics. He has a background in analysing EV batteries for second-life applications and recycling, with experience in impedance spectroscopy and data-driven methods. He earned his PhD at the Institute of Engineering Thermodynamics at the University of Siegen.
 
-- name : Dr Phil Grünewald FICE
+  - name : Dr Phil Grünewald FICE
     title: Oxford Martin Fellow
     image: 'Phil-Grunewald.jpg'
     bio: Phil loves data. He collects smart meter, diary, socio-demographic and other sensor data to explain variations and flexibility in UK household energy demand. This approach is based on his interdisciplinary EPSRC Fellowship, which he applied as PI of the METER project and now as Co-I of EDOL. Phil worked in the semiconductor and photovoltaic industry before completing his PhD on grid energy storage at Imperial College. In his spare time he is a passionate rower, cyclist and roller skier.

docs/_includes/head.html

@@ -2,41 +2,28 @@
 	<link href="https://gmpg.org/xfn/11" rel="profile">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-	
+
 	<!-- Enable responsiveness on mobile devices-->
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 	<meta name="description" content="{{ site.description }}">
-	
+
 	<title>
 	{% if page.title == "Home" %}
 	  {{ site.title }} &middot; {{ site.tagline }}
 	{% else %}
 	  {{ page.title }} &middot; {{ site.title }}
 	{% endif %}
 	</title>
-	
+
 	<!-- CSS -->
-	<link rel="stylesheet" href="https://use.typekit.net/dvx3ilf.css">
-	<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow:ital,wght@0,400;0,500;0,700;1,400;1,700&display=swap">
-	<style>
-	/* Use Barlow Bold for Latin Extended chars missing from Typekit's Stratos subset */
-	@font-face {
-		font-family: "stratos";
-		src: url(https://fonts.gstatic.com/s/barlow/v13/7cHqv4kjgoGqM7E30-8c4A.ttf) format('truetype');
-		unicode-range: U+0100-017F;
-		font-weight: 500;
-		font-style: normal;
-		font-display: swap;
-	}
-	</style>
 	<link rel="stylesheet" href="{{ site.baseurl }}/styles/css/style.css?v={{ site.version }}">
 	<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 	<!--[if lt IE 9]>
 	<link rel="stylesheet" href="{{ site.baseurl }}/styles/css/style_for_ie.css?v={{ site.version }}">
 	<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
 	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
-	
+
 	<!-- Icons -->
 	<link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/apple-touch-icon.png">
 	<link rel="icon" type="image/png" sizes="32x32" href="{{ site.baseurl }}/favicon-32x32.png">
@@ -46,7 +33,7 @@
 	<meta name="msapplication-TileColor" content="#002047">
 	<meta name="theme-color" content="#002047">
 	{% if page.title != "Contact" %}<meta name="format-detection" content="telephone=no">{% endif %}
-	
+
 	<!-- Google Analytics -->
 	<script>
 		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -58,5 +45,5 @@
 		ga('send', 'pageview');
 	</script>
 	<!-- End Google Analytics -->
-	
+
 </head>