Merge branch 'main' into update_dockerfile

.github/workflows/test.yml

@@ -1,18 +1,18 @@
 name: ci:test
-on: [push, pull_request]
+on:
+ push: 
+ branches: [main, development]
+ pull_request:
+ branches: [main, development]
 
 jobs:
  test:
  if: github.repository_owner == 'minicomp'
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 1
+ - uses: actions/checkout@v3
  - uses: ruby/setup-ruby@v1
  with:
  bundler-cache: true
- - name: install
- run: gem install bundler && bundle
  - name: test
  run: bundle exec rake wax:test

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.2.2

Gemfile

@@ -3,9 +3,8 @@
 source 'https://rubygems.org'
 gemspec
 
-# Temporarily pin jekyll to avoid absolute_url bug in 4.2
-gem 'jekyll', '4.1'
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-gem 'kramdown-parser-gfm'
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+ gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
+ gem "tzinfo", ">= 1", "< 3"
+ gem "tzinfo-data"
+end

README.md

@@ -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 >= 2.4` with `bundler` installed.
+You'll need `git` and `ruby >= 3.2` 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:

_config.yml

@@ -33,12 +33,7 @@ logo: '/assets/logo.png'
 permalink: 'pretty'
 sass:
  style: compressed
-exclude:
- - Gemfile*
- - Rakefile
- - vendor
- - spec
- - README.md
+exclude: ["Gemfile*", "*.gemspec", "Rakefile", "vendor", "spec", "README.md", "LICENSE.txt", "Docker*"]
 incremental: true
 webrick:
  headers:

_includes/collection_gallery.html

@@ -21,14 +21,14 @@
  {% if subset %}
  {% for item in subset %}
  {%- capture item_html -%}
- "<div class='gallery-item {{ item[include.facet_by] | slugify }} all'><a href='{{ item.url | absolute_url }}'><div class='hovereffect'><img class='img-responsive gallery-thumb' src='{{ item.thumbnail | absolute_url }}'/><div class='overlay'><p class='info'>{{ item.label }}</p></div></div></a></div>"
+ "<div class='gallery-item {{ item[include.facet_by] | slugify }} all'><a href='{{ item.url | absolute_url }}'><div class='hovereffect'><img class='img-responsive gallery-thumb' src='{{ item.thumbnail | absolute_url }}' alt='{{ item.label | escape }}'/><div class='overlay'><p class='info'>{{ item.label | escape }}</p></div></div></a></div>"
  {%- endcapture -%}
  gallery.append({{ item_html | strip_newlines }});
  {% endfor %}
  {% else %}
  {% for item in collection %}
  {%- capture item_html -%}
- "<div class='gallery-item {{ item[include.facet_by] | slugify }} all'><a href='{{ item.url | absolute_url }}'><div class='hovereffect'><img class='img-responsive gallery-thumb' src='{{ item.thumbnail | absolute_url }}' alt='{{ item.label | escape }}'/><div class='overlay'><p class='info'>{{ item.label }}</p></div></div></a></div>"
+ "<div class='gallery-item {{ item[include.facet_by] | slugify }} all'><a href='{{ item.url | absolute_url }}'><div class='hovereffect'><img class='img-responsive gallery-thumb' src='{{ item.thumbnail | absolute_url }}' alt='{{ item.label | escape }}'/><div class='overlay'><p class='info'>{{ item.label | escape }}</p></div></div></a></div>"
  {%- endcapture -%}
  gallery.append({{ item_html | strip_newlines }});
  {% endfor %}

_includes/head.html

@@ -10,5 +10,4 @@
  <link rel='stylesheet' href="{{ '/assets/styles.css' | absolute_url }}"/>
 
  <script type='text/javascript' src="{{ '/assets/jquery-3.2.1.min.js' | absolute_url }}"></script>
- <noscript><p>Please enable JavaScript in your browser.</p></noscript>
 </head>

_layouts/default.html

@@ -18,8 +18,7 @@
  </div>
 
  {% include footer.html %}
+ <script type='text/javascript' async defer src='{{ "/assets/bootstrap/bootstrap.min.js" | absolute_url }}'></script>
+ <script type='text/javascript' async defer src='{{ "/assets/popper.min.js" | absolute_url }}'></script>
  </body>
-
- <script type='text/javascript' async defer src='{{ "/assets/bootstrap/bootstrap.min.js" | absolute_url }}'></script>
- <script type='text/javascript' async defer src='{{ "/assets/popper.min.js" | absolute_url }}'></script>
 </html>

wax_theme.gemspec

@@ -11,8 +11,9 @@ Gem::Specification.new do |spec|
 
  spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README)!i) }
 
- spec.add_runtime_dependency 'jekyll', '~> 4.1'
+ 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_development_dependency 'html-proofer', '~> 3.15'
 end