From d7f3299f156cef4c8301f68c9684372519a76a54 Mon Sep 17 00:00:00 2001 From: smoreface Date: Sat, 27 Dec 2025 23:46:17 -0500 Subject: [PATCH 1/4] update ruby version and gems update ruby version to 3.4 which is still supported for the next few years and add new dependencies to gemspec to account for gems no longer included by default in 3.4 and 3.5 --- .ruby-version | 2 +- wax_theme.gemspec | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index be94e6f53..2f4b60750 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.4 diff --git a/wax_theme.gemspec b/wax_theme.gemspec index 0cfbd330f..a71299797 100644 --- a/wax_theme.gemspec +++ b/wax_theme.gemspec @@ -14,6 +14,11 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'jekyll', '~> 4.3.2' spec.add_runtime_dependency 'wax_tasks', '~> 1.1' spec.add_runtime_dependency 'webrick', '~> 1.8' + spec.add_runtime_dependency 'csv', '~> 3.3', '>= 3.3.5' # used by jekyll but no longer in ruby v3.4 + spec.add_runtime_dependency 'logger', '~> 1.7' # used by jekyll but no longer in ruby v3.5 + spec.add_runtime_dependency 'base64', '~> 0.3.0' # used by safe yaml but no longer in ruby v3.4 spec.add_development_dependency 'html-proofer', '~> 3.15' + spec.add_development_dependency 'benchmark', '~> 0.5.0' # used by mini_magick in pages task + end From 506923a0fff247d764bcca3c7db34156e6a607be Mon Sep 17 00:00:00 2001 From: smoreface Date: Sat, 27 Dec 2025 23:48:07 -0500 Subject: [PATCH 2/4] change scss format SCSS @import is deprecated in favor of @use syntax so this updates the two spots in _wax.scss and styles.scss to make it work again without errors in trace build --- _sass/_wax.scss | 39 ++++++++++++++++++++++++- assets/styles.scss | 73 ++++++++++++++++++++-------------------------- 2 files changed, 69 insertions(+), 43 deletions(-) diff --git a/_sass/_wax.scss b/_sass/_wax.scss index a49ed524b..2e4cc57e5 100644 --- a/_sass/_wax.scss +++ b/_sass/_wax.scss @@ -1,4 +1,35 @@ -@import 'bootstrap'; +@use 'bootstrap'; + + +// Define all variables with !default so they can be configured via 'with' +// These are the default values that will be used if not overridden + +/* text */ +$body-font: bootstrap.$font-family-base !default; +$heading-font: bootstrap.$font-family-base !default; + +/* Image Size */ +$thumbnail-height: 140px !default; +$thumbnail-width: 140px !default; + +/* colors */ +$text-color: #100c01 !default; +$bg-color: #ffffff !default; +$neutral: #eae7de !default; +$accent-light: #966d09 !default; +$accent-dark: #644906 !default; + +/* viewport sizes */ +$max-width: 800px !default; + +/* margins */ +$less-margin: 1.0rem !default; +$margin: 1.5rem !default; +$more-margin: 2.0rem !default; +$super-margin: 3.0rem !default; +$viewer-height: 550px !default; +$parallax-height: 350px !default; +$footer-height: 250px !default; /* @@ -92,6 +123,10 @@ header & nav bar } } } + + .search-block { + // margin: 10px 0; + } } /* @@ -245,6 +280,8 @@ content section } + + .wax-inline-container { @extend .container; diff --git a/assets/styles.scss b/assets/styles.scss index a31ca30a9..5017de18c 100755 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -1,51 +1,40 @@ --- sitemap: false --- -/* -variable declaration -*/ +@use 'wax' with ( + /* text */ + $body-font: ('Open Sans', 'sans-serif'), + $heading-font: ('Open Sans', 'sans-serif'), + + /* Image Size */ + $thumbnail-height: 140px, + $thumbnail-width: 140px, + + /* colors */ + $text-color: #100c01, + $bg-color: #ffffff, + $neutral: #eae7de, + $accent-light: #966d09, + $accent-dark: #644906, + + /* viewport sizes */ + $max-width: 800px, + + /* margins */ + $less-margin: 1.0rem, + $margin: 1.5rem, + $more-margin: 2.0rem, + $super-margin: 3.0rem, + $viewer-height: 550px, + $parallax-height: 350px, + $footer-height: 250px +); /* branding */ -$logo: url("{{ '/assets/logo.png' | absolute_url }}"); - -/* text */ - -$body-font: 'Open Sans', 'sans-serif'; -$heading-font: 'Open Sans', 'sans-serif'; - - -/* Image Size */ - -$thumbnail-height: 140px; -$thumbnail-width: 140px; - -/* colors */ - -$text-color: #100c01; -$bg-color: #ffffff; -$neutral: #eae7de; -$accent-light: #966d09; -$accent-dark: #644906; - -/* viewport sizes */ - -$max-width: 800px; - -/* margins */ - -$less-margin: 1.0rem; -$margin: 1.5rem; -$more-margin: 2.0rem; -$super-margin: 3.0rem; - - -$viewer-height: 550px; -$parallax-height: 350px; -$footer-height: 250px; +$logo: url("{{ '/assets/pmc-archive.jpg' | absolute_url }}"); /* -font & asset import +font import */ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&font-display=auto'); -@import 'wax'; +@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&font-display=auto'); \ No newline at end of file From c83bd2e26106aad4ffa473c94d87a1264c05c37e Mon Sep 17 00:00:00 2001 From: smoreface Date: Sat, 27 Dec 2025 23:59:15 -0500 Subject: [PATCH 3/4] update ruby version in wiki --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 68ffd0388..6984634af 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ __Wax is an extensible workflow for producing scholarly exhibitions with minimal It's comprised of: __a few Ruby gems__ for processing image data and associated metadata ([wax_tasks](https://github.com/minicomp/wax_tasks/), [wax_iiif](https://github.com/minicomp/wax_iiif/)), __a Jekyll theme__ ([wax_theme](https://github.com/minicomp/wax/)), and (hopefully soon!) a lot of __documentation and recipes__ for creating, deploying, and maintaining digital exhibitions. -- [Prerequisites](#Prerequisites) -- [Getting Started](#Getting-Started) -- [Using Docker](#Using-Docker) -- [Contributing](#Contributing) +- [Prerequisites](#prerequisites) +- [Getting Started](#getting-started) +- [Using Docker](#using-docker) +- [Contributing](#contributing)
@@ -32,7 +32,7 @@ It's comprised of: __a few Ruby gems__ for processing image data and associated # Prerequisites -You'll need `git` and `ruby >= 3.2` with `bundler` installed. +You'll need `git` and `ruby >= 3.4` with `bundler` installed. These dependencies can either be installed natively on your system or within a [Docker environment](#Using-Docker). For instructions, check the Wiki's [Setting up your system page](https://minicomp.github.io/wiki/wax/setting-up-your-system/). Check your versions with: From 31e98572a9d1742edc1b6d715b582418d5f53795 Mon Sep 17 00:00:00 2001 From: smoreface Date: Sun, 28 Dec 2025 00:01:19 -0500 Subject: [PATCH 4/4] remove errant css changes --- _sass/_wax.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_sass/_wax.scss b/_sass/_wax.scss index 2e4cc57e5..91b22e090 100644 --- a/_sass/_wax.scss +++ b/_sass/_wax.scss @@ -123,10 +123,6 @@ header & nav bar } } } - - .search-block { - // margin: 10px 0; - } } /* @@ -280,8 +276,6 @@ content section } - - .wax-inline-container { @extend .container;