Merge pull request 'Bump Jekyll and all its deps including Ruby' (#14) from 12.deps-update into main

Reviewed-on: #14

_config.yml

@@ -30,7 +30,7 @@ incremental: false
 
 #theme: minima
 theme: minimal-mistakes-jekyll
-minimal_mistakes_skin: dirt # Out of "default", "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum" "sunrise"
+minimal_mistakes_skin: default # Out of "default", "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum" "sunrise"
 logo: "/assets/images/logo_199x300.png"
 locale: "en-US"
 
@@ -114,7 +114,6 @@ defaults:
     values:
       layout: single
       author_profile: false
-      share: true
 
 category_archive:
   type: jekyll-archives

docker-compose.yml

@@ -17,8 +17,7 @@ services:
     tty: true
     hostname: jekyll.local
     container_name: jekyll.local
-    networks:
+    network_mode: "bridge"
-      - bridge
     deploy:
       resources:
         limits:

docker/jekyll/Dockerfile

@@ -1,5 +1,5 @@
 # Pull base image from official repo
-FROM rubylang/ruby:3.3.0-jammy
+FROM ruby:3.3.6-slim-bookworm
 
 # Install some required packages for building Gems
 RUN INSTALL_PKGS="gcc g++ libyaml-dev make nodejs" && \

docker/jekyll/Gemfile.lock

@@ -1,32 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
+    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 6.0)
+      public_suffix (>= 2.0.2, < 7.0)
     autoprefixer-rails (9.8.6.5)
       execjs
-    bootstrap (5.3.2)
+    bigdecimal (3.1.8)
+    bootstrap (5.3.3)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
     colorator (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (2.9.0)
+    faraday (2.12.1)
-      faraday-net_http (>= 2.0, < 3.2)
+      faraday-net_http (>= 2.0, < 3.5)
-    faraday-net_http (3.1.0)
+      json
-      net-http
+      logger
-    ffi (1.16.3)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
-    google-protobuf (4.26.1)
+    google-protobuf (4.28.3)
+      bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.3)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -61,27 +65,29 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
+    json (2.8.2)
-      rexml
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
     mercenary (0.4.0)
-    minima (2.5.1)
+    minima (2.5.2)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minimal-mistakes-jekyll (4.25.0)
+    minimal-mistakes-jekyll (4.25.1)
       jekyll (>= 3.7, < 5.0)
       jekyll-feed (~> 0.1)
       jekyll-gist (~> 1.5)
       jekyll-include-cache (~> 0.1)
       jekyll-paginate (~> 1.1)
       jekyll-sitemap (~> 1.3)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -89,25 +95,25 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     popper_js (2.11.8)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     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)
+    rexml (3.3.9)
-    rouge (4.2.1)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.75.0)
+    sass-embedded (1.81.0)
-      google-protobuf (>= 3.25, < 5.0)
+      google-protobuf (~> 4.28)
-      rake (>= 13.0.0)
+      rake (>= 13)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
-    uri (0.13.0)
+    uri (1.0.2)
-    webrick (1.8.1)
+    webrick (1.9.0)
 
 PLATFORMS
   ruby

src/_sass/_custom.scss

@@ -1,20 +1,165 @@
-.initial-content {
+body {
-  background: url(../images/pattern-1.png) repeat left top;
+  font-family: system-ui;
 }
 
-form {
+.page__hero--overlay {
-  background-color: transparent;
+  padding: 1em;
-  padding: 0em;
 }
 
-td {
+.page__hero--overlay .page__title {
-  border-bottom: 10px;
+  text-shadow: unset;
 }
 
-.pagination--pager.disabled {
+.page__hero--overlay .page__lead {
-  background-color: #e9dcbe;
+  text-shadow: unset;
 }
 
-.pagination--pager {
+.btn {
-  background-color: #e9dcbe;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-variant-caps: all-small-caps;
+  border-radius: 58px;
+}
+
+.page__hero--overlay .btn {
+  background-color: #fff;
+  color: #0075a2;
+  text-shadow: unset;
+}
+
+.page__hero--overlay .btn:hover {
+  background-color: #777;
+  color: #fff;
+}
+
+#main {
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+.page__content .archive__item-title {
+  margin-top: 2em;
+}
+
+#documentation .feature__wrapper {
+  margin-bottom: auto;
+}
+
+.feature__wrapper {
+  border-bottom: unset;
+  margin-bottom: unset;
+}
+
+.feature__item {
+  background-color: #eee;
+  height: 15em;
+  margin-bottom: 1em;
+  border-radius: 4px;
+}
+
+.feature__item .archive__item-title {
+  text-align: center;
+}
+
+.feature__item .archive__item-body {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  padding-bottom: 0.5em;
+}
+
+.feature__item .archive__item-teaser img {
+  width: initial;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.feature__item .btn {
+  background-color: #0075a2;
+  color: #fff;
+}
+
+.feature__item .btn:hover {
+   background-color: #777;
+   color: #fff;
+}
+
+#contribute .feature__wrapper {
+  margin-bottom: auto;
+}
+
+#contribute .feature__item {
+  height: 16em;
+}
+
+#blog {
+  margin-top: 2em;
+  background-color: #eee;
+  border-radius: 4px;
+}
+
+.entries-grid {
+  background-color: #eee;
+  margin-bottom: auto;
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+.grid__item {
+  background-color: #ccc;
+  padding: 0.5em;
+  border-radius: 4px;
+}
+
+.grid__item .archive__item-title {
+  text-align: center;
+}
+
+.grid__item .archive__item-excerpt {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+
+.grid__item .grid__item-teaser img {
+  width: initial;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.entries-grid::after {
+  clear: both;
+  content: "";
+  display: table;
+}
+
+#about {
+  background-color: #fff;
+}
+
+#about .feature__item {
+  height: 12em;
+}
+
+#about .feature__item .archive__item-title {
+  padding-top: 0.5em;
+}
+
+.feature__item--center {
+  text-align: center;
+}
+
+.page .page__inner-wrap {
+  background-color: #eee;
+  padding: 0.5em;
+  border-radius: 4px;
+}
+
+.page__meta + .pagination {
+  padding-top: 0;
+  background-color: #fff;
+}
+
+.page__footer {
+  background-color: #eee;
 }

src/index.html

@@ -3,37 +3,32 @@ title: "Welcome <i>The</i> Least-Authority File Store"
 layout: splash
 author_profile: false
 header:
-  overlay_color: "#000"
+  overlay_color: "#101820"
-  overlay_filter: "0.4"
-  overlay_image: /assets/images/overlay.jpg
   actions:
     - label: "Download"
       url: "https://tahoe-lafs.org/downloads"
-  caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
+excerpt: >-
-excerpt: "Tahoe-LAFS is a Free and Open decentralized cloud storage system.
+  Tahoe-LAFS is a Free and Open decentralized cloud storage system.
   It distributes your data across multiple servers.<br/>
   Even if some of the servers fail or are taken over by an attacker,
-  the entire file store continues to function correctly, preserving your privacy and security."
+  the entire file store continues to function correctly, preserving your privacy and security.
 documentation:
-  - title: "Read Some Nice Docs"
+  - title: "Documentation"
 documentation_list:
-  - image_path: /assets/images/overview.jpg
+  - image_path: /assets/images/overview.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "overview"
     title: "Overview"
     excerpt: '
       This [one-page summary](https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html) explains the unique properties of this system
     '
-  - image_path: /assets/images/manual.jpg
+  - image_path: /assets/images/manual.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "manual"
     title: "Manual"
     excerpt: '<ul>
       <li><a href="https://tahoe-lafs.readthedocs.io/en/latest/Installation/install-tahoe.html">Installation Instructions</a></li>
       <li><a href="http://tahoe-lafs.readthedocs.org/">Tahoe-LAFS Manual</a></li>
     </ul>'
-  - image_path: /assets/images/wiki.jpg
+  - image_path: /assets/images/wiki.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "wiki"
     title: "Wiki"
     excerpt: '<ul>
@@ -41,31 +36,25 @@ documentation_list:
       <li><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></li>
     </ul>'
 contribute:
-  - title: "Get Involved"
+  - title: "Contribute"
     excerpt: ""
 contribute_list:
-  - image_path: /assets/images/messaging.jpg
+  - image_path: /assets/images/discussions.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "discussions"
     title: "Discussions"
     excerpt: '<ul>
       <li>Join <a href="https://lists.tahoe-lafs.org/mailman/listinfo/tahoe-dev" target="_blank">the <b>tahoe-dev</b></a> mailing list</li>
       <li>Join the <a href="https://libera.chat/" target="_blank"><b>#tahoe-lafs</b></a> channel on Libera</li>
-      <li>Join our <a href="https://meet.jit.si/AccurateFiltersManipulateBefore" target="blank"><b>Tuesday 1700 UTC meetings</b></a>
+      <li>Meet us on <a href="https://meet.jit.si/AccurateFiltersManipulateBefore" target="blank"><b>Tuesday</b></a> at 17:00 UTC on Jitsi </li>
-      <ul>
-        <li>First of the month for project governance</li>
-        <li>Others for technical discussions</li>
     </ul>'
-  - image_path: /assets/images/tickets.jpg
+  - image_path: /assets/images/issues.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "issues"
     title: "Issues"
     excerpt: '<ul>
       <li>Visit the <a href="https://code.lafs.eval.latfa.net/tahoe-lafs/trac/issues"><b>issue</b></a> tracker</li>
       <li>Register an <a href="https://code.lafs.eval.latfa.net/user/sign_up"><b>account</b></a> to interact</li>
     </ul>'
-  - image_path: /assets/images/code.jpg
+  - image_path: /assets/images/code.png
-    image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)"
     alt: "code"
     title: "Code"
     excerpt: '<ul>
@@ -73,11 +62,11 @@ contribute_list:
       <li>Submit pull request with a valid issue number</li>
     </ul>'
 blog:
-  - title: "News"
+  - title: "Latest News"
-    excerpt: "Find here under a list of the latest articles on the subjects that matter for us."
+    excerpt: ""
 about:
   - title: "About us"
-    excerpt: "Here comes something about us..."
+    excerpt: ""
 about_list:
   - title: "Volunteers"
     excerpt: "Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers...<br/>"
@@ -103,10 +92,12 @@ about_list:
 {% include feature_row id="documentation" type="center" %}
 {% include feature_row id="documentation_list" %}
 </div>
+
 <div id="contribute">
 {% include feature_row id="contribute" type="center" %}
 {% include feature_row id="contribute_list" %}
 </div>
+
 <div id="blog">
 {% include feature_row id="blog" type="center" %}
 <div class="entries-grid">
@@ -124,6 +115,8 @@ about_list:
   </div>
   {% endfor %}
 </div>
+</div>
+
 <div id="about">
 {% include feature_row id="about" type="center" %}
 {% include feature_row id="about_list" %}