diff --git a/site/Gemfile b/site/Gemfile index a3551b1..9a3a471 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -12,14 +12,18 @@ source "https://rubygems.org" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. gem 'jekyll', '~> 4.3' -# If you have any plugins, put them here! + group :jekyll_plugins do - gem 'jekyll-github-metadata', '~> 2.16' + # If you have any plugins, put them here! end gem 'json' -gem "bootswatch", github: "thomaspark/bootswatch", tag: "v5.3.3" -gem "bootstrap", "~> 5.3.3" +gem "bootswatch", github: "thomaspark/bootswatch", tag: "v5.3.6" +gem "bootstrap", "~> 5.3.5" + +# pinned version of dependency of jekyll-sass-converter, as it emits deprecation warnings until +# bootstrap v5.5.0 - see https://github.com/OpenTabletDriver/opentabletdriver.github.io/issues/212 +gem 'sass-embedded', "~> 1.78.0" # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. diff --git a/site/Gemfile.lock b/site/Gemfile.lock index b5a5592..129e964 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -1,68 +1,94 @@ GIT remote: https://github.com/thomaspark/bootswatch.git - revision: 646c94da2c262473c6f73664f4547c046f3a28dd - tag: v5.3.3 + revision: c72edbf8ae5d3607cb3d07f56917feac654266fd + tag: v5.3.6 specs: - bootswatch (5.3.3) + bootswatch (5.3.6) GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - autoprefixer-rails (10.4.19.0) - execjs (~> 2) - bootstrap (5.3.3) - autoprefixer-rails (>= 9.1.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bigdecimal (3.1.9) + bootstrap (5.3.5) popper_js (>= 2.11.8, < 3) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) + csv (3.3.4) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.10.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http - ffi (1.16.3) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86-linux-musl) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) forwardable-extended (2.6.0) - google-protobuf (3.25.3) - google-protobuf (3.25.3-aarch64-linux) - google-protobuf (3.25.3-arm64-darwin) - google-protobuf (3.25.3-x86-linux) - google-protobuf (3.25.3-x86_64-darwin) - google-protobuf (3.25.3-x86_64-linux) + google-protobuf (4.31.0) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-aarch64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-aarch64-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-x86-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-x86-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-x86_64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.0-x86_64-linux-musl) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.3) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) + json (~> 2.6) kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) terminal-table (>= 1.8, < 4.0) webrick (~> 1.7) - jekyll-github-metadata (2.16.1) - jekyll (>= 3.4, < 5.0) - octokit (>= 4, < 7, != 4.4.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.7.6) - kramdown (2.4.0) - rexml + json (2.12.2) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) @@ -70,57 +96,49 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - net-http (0.4.1) - uri - octokit (6.1.1) - faraday (>= 1, < 3) - sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) popper_js (2.11.8) - public_suffix (5.0.4) + public_suffix (6.0.2) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) - rouge (4.2.0) + rexml (3.4.1) + rouge (4.5.2) safe_yaml (1.0.5) - sass-embedded (1.69.5-aarch64-linux-android) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-aarch64-linux-gnu) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-aarch64-linux-musl) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-arm-linux-androideabi) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-arm-linux-gnueabihf) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-arm-linux-musleabihf) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-arm64-darwin) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86-linux-android) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86-linux-gnu) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86-linux-musl) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86_64-darwin) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86_64-linux-android) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86_64-linux-gnu) - google-protobuf (~> 3.23) - sass-embedded (1.69.5-x86_64-linux-musl) - google-protobuf (~> 3.23) - sawyer (0.9.2) - addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) + sass-embedded (1.78.0-aarch64-linux-android) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-aarch64-linux-gnu) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-aarch64-linux-musl) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-arm-linux-androideabi) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-arm-linux-gnueabihf) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-arm-linux-musleabihf) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-arm64-darwin) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86-linux-android) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86-linux-gnu) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86-linux-musl) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86_64-darwin) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86_64-linux-android) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86_64-linux-gnu) + google-protobuf (~> 4.27) + sass-embedded (1.78.0-x86_64-linux-musl) + google-protobuf (~> 4.27) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.5.0) - uri (0.13.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + webrick (1.9.1) PLATFORMS aarch64-linux @@ -141,12 +159,12 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES - bootstrap (~> 5.3.3) + bootstrap (~> 5.3.5) bootswatch! http_parser.rb (~> 0.6.0) jekyll (~> 4.3) - jekyll-github-metadata (~> 2.16) json + sass-embedded (~> 1.78.0) tzinfo (>= 1, < 3) tzinfo-data wdm (~> 0.1.1) diff --git a/site/assets/css/site.scss b/site/assets/css/site.scss index eb4d993..3955807 100644 --- a/site/assets/css/site.scss +++ b/site/assets/css/site.scss @@ -63,8 +63,8 @@ div.highlighter-rouge { } #page-title { - @include markdown-header; font-size: calc(1.375em + 1.5vw); + @include markdown-header; } @media (min-width: 1200px) {