Skip to content

Commit

Permalink
Merge pull request #663 from ZeusWPI/dark_mode
Browse files Browse the repository at this point in the history
Introduce dark mode by updating bulma and dart-sass
  • Loading branch information
redfast00 authored Oct 4, 2024
2 parents 6d343bd + a860481 commit fc526ac
Show file tree
Hide file tree
Showing 36 changed files with 955 additions and 590 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/build_site/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build the site
description: Build the site using nanoc

runs:
using: 'composite'
steps:
- name: Checkout submodule
shell: bash
run: git submodule update --init --recursive --remote
- name: Cache install Nix packages
uses: rikhuijzer/cache-install@c90964bcac3286c8571cb849f7caffb9e8b9cb37
with:
key: nix-${{ hashFiles('packages.nix', 'gemset.nix') }}
nix_file: 'packages.nix'
- name: Cache Output
id: cache-output
uses: actions/cache@v4
with:
path: |
./tmp/
./output/
key: build-${{ github.ref_name }}
restore-keys: |
build-master
- name: Set environment variable
shell: bash
run: "export LANG=en_US.UTF-8"
- name: Build site
shell: bash
run: "bundle exec nanoc --env=prod"
- name: Run checks
shell: bash
run: "bundle exec nanoc --env=prod check --deploy"
24 changes: 1 addition & 23 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout submodule
run: git submodule update --init --recursive --remote
- name: Cache install Nix packages
uses: rikhuijzer/cache-install@249745afd54c8e2be0eb99aa6032b52629239b48
with:
key: nix-${{ hashFiles('packages.nix') }}
nix_file: 'packages.nix'
- name: Cache Output
id: cache-output
uses: actions/cache@v3
with:
path: |
./tmp/
./output/
key: build-${{ github.ref_name }}
restore-keys: |
build-master
- name: Set environment variable
run: "export LANG=en_US.UTF-8"
- name: Build site
run: "nanoc --env=prod"
- name: Run checks
run: "nanoc --env=prod check --deploy"
- uses: ./.github/workflows/build_site
- name: Add private key
shell: bash
env:
Expand Down
24 changes: 1 addition & 23 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout submodule
run: git submodule update --init --recursive --remote
- name: Cache install Nix packages
uses: rikhuijzer/cache-install@249745afd54c8e2be0eb99aa6032b52629239b48
with:
key: nix-${{ hashFiles('packages.nix') }}
nix_file: 'packages.nix'
- name: Cache Output
id: cache-output
uses: actions/cache@v3
with:
path: |
./tmp/
./output/
key: build-${{ github.ref_name }}
restore-keys: |
build-master
- name: Set environment variable
run: "export LANG=en_US.UTF-8"
- name: Build site
run: "nanoc --env=prod"
- name: Run checks
run: "nanoc --env=prod check --deploy"
- uses: ./.github/workflows/build_site
- name: Add private key
shell: bash
env:
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
#url = ssh://[email protected]:2222/bestuur/drive.git
url = https://git.zeus.gent/zeuswpi/drive.git
branch = master
[submodule "content/assets/stylesheets/bulma"]
path = content/assets/stylesheets/bulma
url = https://github.com/jgthms/bulma
[submodule "content/assets/stylesheets/bulma-timeline"]
path = content/assets/stylesheets/bulma-timeline
url = https://github.com/ymkapuriya/bulma-timeline
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.3.5
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ gem 'tzinfo'
# Take screenshots for our banner image
gem 'puppeteer-ruby'

gem 'sass-embedded'

# Silences warnings that they will be no longer part of the standard library in Ruby 3.5
gem 'pstore'
gem 'logger'

# Not found in Github actions
gem 'terser'

group :development do
gem 'adsf'
# puma instead of thin, see https://github.com/nanoc/nanoc/issues/1499
Expand Down
Loading

0 comments on commit fc526ac

Please sign in to comment.