Update theme

metgem · Mar 25, 2024 · 0fc8790 · 0fc8790
2 parents 8419186 + fca5813
commit 0fc8790
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,11 +5,11 @@ jobs:
     name: Build Jekyll
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Build the site in the jekyll/builder container
-        run: |
-          export JEKYLL_VERSION=3.8
-          docker run \
-          -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
-          -e PAGES_REPO_NWO=${{ github.repository }} \
-          jekyll/builder:$JEKYLL_VERSION /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future"
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+      - name: Install dependencies
+        run: bundle install && bundle exec appraisal install
+      - name: Build site
+        run: bundle exec appraisal jekyll build --future
diff --git a/Appraisals b/Appraisals
@@ -0,0 +1,6 @@
+appraise "jekyll-3" do
+  gem "jekyll", "3.9.4"
+end
+appraise "jekyll-4" do
+  gem "jekyll", "4.3.3"
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,15 @@
 ## Unreleased version
 - BREAKING CHANGE: Allow changing the order of the social network links that appear in the footer (#1152)
 - BREAKING CHANGE: `google-scholar` social network link no longer requires the prefix `citations?user=`; if you previously set this parameter, it needs to be updated (#1189)
+- Added explicit support for favicons, you only need to add a `favicon.ico` file to the root directory
 - The footer of a page always sticks to the bottom, even on short pages (#576)
 - Added `author` YAML parameter to allow specifying the author(s) of a post (#1220)
 - Fixed bug where hovering over search results showed the text "{desc}" (#1156)
-- Added social network links for GitLab, Bluesky (#1168, #1218)
+- Added social network links for GitLab, Bluesky, Whatsapp (#1168, #1218, #1299)
 - Added instructions and example on how to fix image links in project sites (#1171)
 - Pagination buttons: use nicer arrows, and don't show text on small screens (#1221)
+- Updated Yelp URL format - if you previously used the `yelp` social network config parameter, you might need to update the config value (#1259)
+- Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272)
 
 ## v6.0.1 (2023-06-08)
 

diff --git a/README.md b/README.md
@@ -45,7 +45,6 @@ __Check out [*What's New?*](https://beautifuljekyll.com/updates/) to see the lat
 Developing and maintaining Beautiful Jekyll takes a lot of time and effort - thank you to anyone who helps fund this effort!
 
 - [DoFollow](https://dofollow.co.uk/)
-- [\_hyp3ri0n](https://hyperiongray.com)
 - [Varna Sri Raman](https://about.me/varna)
 
 **[Become a sponsor for Beautiful Jekyll and unlock new features\!](https://github.com/sponsors/daattali/sponsorships?tier_id=39856)**

diff --git a/_config.yml b/_config.yml
@@ -82,6 +82,7 @@ social-network-links:
 #  kaggle: yourname
 #  hackerrank: yourname
 #  gitlab: yourname
+#  itchio: yourname
 
 # If you want your website to generate an RSS feed, provide a description
 # The URL for the feed will be https://<your_website>/feed.xml
@@ -102,6 +103,9 @@ share-links-active:
 # Remove this if you don't want a link in the footer
 # url-pretty: "MyWebsite.com"
 
+# Add the website title to the title of every page
+title-on-all-pages: true
+
 # Excerpt word length - Truncate the excerpt of each post on the feed page to the specified number of words
 excerpt_length: 50
 

diff --git a/_includes/head.html b/_includes/head.html
@@ -2,7 +2,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-  {% capture title %}
+  {% capture pagetitle %}
     {%- if page.share-title -%}
       {{ page.share-title | strip_html | xml_escape }}
     {%- elsif page.title -%}
@@ -12,6 +12,14 @@
     {%- endif -%}
   {% endcapture %}
 
+  {% capture title %}
+    {%- if site.title and site.title-on-all-pages and (site.title != pagetitle) -%}
+      {{ pagetitle }} | {{ site.title }}
+    {%- else -%}
+      {{ pagetitle }}
+    {%- endif -%}
+  {% endcapture %}
+
   {% capture description %}
     {%- if page.share-description -%}
       {{ page.share-description | strip_html | xml_escape }}
@@ -152,6 +160,11 @@
   <link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}">
   {% endif %}
 
+  {% assign favicon_exists = site.static_files | where: "path", "/favicon.ico" | size %}
+  {% if favicon_exists == 1 %}
+  <link rel="icon" href="{{ '/favicon.ico' | relative_url }}" />
+  {% endif %}
+
   {% if page.head-extra %}
     {% for file in page.head-extra %}
       {% include {{ file }} %}

diff --git a/_includes/social-networks-links.html b/_includes/social-networks-links.html
@@ -63,6 +63,18 @@
   </li>
   {%- endif -%}
 
+  {%- if network[0] == "whatsapp" -%}
+  <li class="list-inline-item">
+    <a href="https://wa.me/{{ network[1] }}" title="Whatsapp">
+      <span class="fa-stack fa-lg" aria-hidden="true">
+        <i class="fas fa-circle fa-stack-2x"></i>
+        <i class="fab fa-whatsapp fa-stack-1x fa-inverse"></i>
+      </span>
+      <span class="sr-only">Whatsapp</span>
+    </a>
+  </li>
+  {%- endif -%}
+
   {%- if network[0] == "github" -%}
   <li class="list-inline-item">
     <a href="https://github.com/{{ network[1] }}" title="GitHub">
@@ -233,7 +245,7 @@
 
   {%- if network[0] == "yelp" -%}
   <li class="list-inline-item">
-    <a href="https://{{ network[1] }}.yelp.com" title="Yelp">
+    <a href="https://yelp.com/{{ network[1] }}" title="Yelp">
       <span class="fa-stack fa-lg" aria-hidden="true">
         <i class="fas fa-circle fa-stack-2x"></i>
         <i class="fab fa-yelp fa-stack-1x fa-inverse"></i>
@@ -370,4 +382,4 @@
 {%- endfor -%}
 
 </ul>
-{% endif %}
+{% endif %}
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -25,13 +25,11 @@
 {% include head.html %}
 
 <body>
-  <div>
-    {% include gtm_body.html %}
+  {% include gtm_body.html %}
 
-    {% include nav.html %}
+  {% include nav.html %}
 
-    {{ content }}
-  </div>
+  {{ content }}
 
   {% include footer.html %}
 

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -4,7 +4,7 @@
 
 {% include header.html type="post" %}
 
-<div class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
+<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
   <div class="row">
     <div class="{% if page.full-width %} col {% else %} col-xl-8 offset-xl-2 col-lg-10 offset-lg-1 {% endif %}">
 
@@ -39,9 +39,9 @@
         </div>
       {% endif %}
 
-      <main class="blog-post">
+      <div class="blog-post">
         {{ content }}
-      </main>
+      </div>
 
       {% if page.tags.size > 0 %}
         <div class="blog-tags">
@@ -85,4 +85,4 @@
       {% include comments.html %}
     </div>
   </div>
-</div>
+</main>
diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css
@@ -22,8 +22,11 @@ body {
   {% endif %}
   overflow-wrap: break-word;
   min-height: 100vh;
-  display: grid;
-  grid-template-rows: 1fr auto;
+  display: flex;
+  flex-direction: column;
+}
+body > main {
+  flex: 1;
 }
 p {
   line-height: 1.5;
@@ -989,6 +992,7 @@ pre {
 
 /* Search bar */
 #beautifuljekyll-search-overlay {
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   display: none;
   z-index: 999999;
   position: fixed;
@@ -1000,6 +1004,7 @@ pre {
   text-align: center;
   padding: 1rem;
 }
+
 #nav-search-exit {
   position: absolute;
   top: 1.5rem;
@@ -1028,6 +1033,7 @@ pre {
   border: none;
   padding: 0 3rem;
 }
+
 @media (max-width: 1199px) {
   #nav-search-input {
     width: 75%;

diff --git a/beautiful-jekyll-theme.gemspec b/beautiful-jekyll-theme.gemspec
@@ -17,13 +17,14 @@ Gem::Specification.new do |spec|
     "documentation_uri" => "https://github.com/daattali/beautiful-jekyll#readme"
   }
 
-  spec.add_runtime_dependency "jekyll", "~> 3.9.3"
+  spec.add_runtime_dependency "jekyll", ">= 3.9.3"
   spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
   spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4"
   spec.add_runtime_dependency "kramdown-parser-gfm", "~> 1.1"
-  spec.add_runtime_dependency "kramdown", "~> 2.3.2"
+  spec.add_runtime_dependency "kramdown", "~> 2.3"
   spec.add_runtime_dependency "webrick", "~> 1.8"
 
   spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "appraisal", "~> 2.5"
 end