build(deps): bump bootstrap from 4.4.1 to 5.5.3

daattali · Nov 10, 2024 · bb32a3c · bb32a3c
1 parent 3920be6
commit bb32a3c
Show file tree

Hide file tree

Showing 10 changed files with 172 additions and 155 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 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)
+- BREAKING CHANGE: `jQuery` is no longer included by default; if you use jQuery, you need to include it yourself (#1375)
 - Added `mathjax` YAML parameter to allow support for MathJax, used to write LaTeX expressions (#195)
 - 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)
@@ -16,6 +17,7 @@
 - Added `title-on-all-pages` config setting, that adds the website title to all page titles (#1272)
 - Change Twitter icon to X (#1193)
 - Upgraded font-awesome to 6.5.2 (#1330)
+- Upgraded bootstrap to 5.5.3 (#1375)
 
 ## v6.0.1 (2023-06-08)
 

diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
@@ -6,16 +6,7 @@
 
 {% if layout.common-js %}
   {% for js in layout.common-js %}
-    <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
-    {% if js contains 'jquery' %}
-      <script>
-        if (typeof jQuery == 'undefined') {
-          document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
-        }
-      </script>
-    {% else %}
-      <script src="{{ js | relative_url }}"></script>
-    {% endif %}
+    <script src="{{ js | relative_url }}"></script>
   {% endfor %}
 {% endif %}
 

diff --git a/_includes/nav.html b/_includes/nav.html
@@ -1,62 +1,64 @@
 <nav class="navbar navbar-expand-xl navbar-light fixed-top navbar-custom {% if page.nav-short %}top-nav-short-permanent{% else %}top-nav-regular{% endif %}">
+  <div class="container-fluid">
 
-  {%- if site.title-img -%}
-    <a class="navbar-brand navbar-brand-logo" href="{{ '/' | absolute_url }}"><img alt="{{ site.title }} Logo" src="{{ site.title-img | relative_url}}"/></a>
-  {%- elsif site.title -%}
-    <a class="navbar-brand" href="{{ '/' | absolute_url }}">{{ site.title }}</a>
-  {%- endif -%}
+    {%- if site.title-img -%}
+      <a class="navbar-brand navbar-brand-logo" href="{{ '/' | absolute_url }}"><img alt="{{ site.title }} Logo" src="{{ site.title-img | relative_url}}"/></a>
+    {%- elsif site.title -%}
+      <a class="navbar-brand" href="{{ '/' | absolute_url }}">{{ site.title }}</a>
+    {%- endif -%}
 
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
 
-  <div class="collapse navbar-collapse" id="main-navbar">
-    <ul class="navbar-nav ml-auto">
-      {%- for link in site.navbar-links -%}
-        {%- if link[1].first %}
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ link[0] }}</a>
-            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-              {%- for childlink in link[1] -%}
-                {%- for linkparts in childlink %}
-                  <a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
-                {%- endfor -%}
-              {%- endfor %}
-            </div>
-          </li>
-        {% else %}
+    <div class="collapse navbar-collapse" id="main-navbar">
+      <ul class="navbar-nav ms-auto">
+        {%- for link in site.navbar-links -%}
+          {%- if link[1].first %}
+            <li class="nav-item dropdown">
+              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">{{ link[0] }}</a>
+              <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
+                {%- for childlink in link[1] -%}
+                  {%- for linkparts in childlink %}
+                    <a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
+                  {%- endfor -%}
+                {%- endfor %}
+              </div>
+            </li>
+          {% else %}
+            <li class="nav-item">
+              <a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
+            </li>
+          {%- endif -%}
+        {%- endfor -%}
+        {% if site.post_search %}
           <li class="nav-item">
-            <a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
+            <a class="nav-link" id="nav-search-link" href="#" title="Search">
+              <span id="nav-search-icon" class="fa fa-search"></span>
+              <span id="nav-search-text">Search</span>
+            </a>
           </li>
         {%- endif -%}
-      {%- endfor -%}
-      {% if site.post_search %}
-        <li class="nav-item">
-          <a class="nav-link" id="nav-search-link" href="#" title="Search">
-            <span id="nav-search-icon" class="fa fa-search"></span>
-            <span id="nav-search-text">Search</span>
-          </a>
-        </li>
-      {%- endif -%}
-    </ul>
-  </div>
+      </ul>
+    </div>
 
-  {% if site.navbar-extra %}
-    {% for file in site.navbar-extra %}
-      {% include {{ file }} %}
-    {% endfor %}
-  {% endif %}
+    {% if site.navbar-extra %}
+      {% for file in site.navbar-extra %}
+        {% include {{ file }} %}
+      {% endfor %}
+    {% endif %}
 
-  {% if site.avatar and page.show-avatar != false %}
-    <div class="avatar-container">
-      <div class="avatar-img-border">
-        <a href="{{ '/' | absolute_url }}">
-          <img alt="Navigation bar avatar" class="avatar-img" src="{{ site.avatar | relative_url }}" />
-        </a>
+    {% if site.avatar and page.show-avatar != false %}
+      <div class="avatar-container">
+        <div class="avatar-img-border">
+          <a href="{{ '/' | absolute_url }}">
+            <img alt="Navigation bar avatar" class="avatar-img" src="{{ site.avatar | relative_url }}" />
+          </a>
+        </div>
       </div>
-    </div>
-  {% endif %}
+    {% endif %}
 
+  </div>
 </nav>
 
 {% include search.html %}
diff --git a/_includes/staticman-comments.html b/_includes/staticman-comments.html
@@ -72,12 +72,6 @@ <h3 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_labe
   </div>
 
   <!-- Load script to handle comment form submission -->
-  <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
-  <script>
-    if (typeof jQuery == 'undefined') {
-      document.write('<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></scr' + 'ipt>');
-    }
-  </script>
   <script src="{{ "/assets/js/staticman.js" | relative_url }}"></script>
 </div>
 {% endif %}
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -3,18 +3,14 @@
   - "/assets/css/bootstrap-social.css"
   - "/assets/css/beautifuljekyll.css"
 common-ext-css:
-  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-    sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
+    sri: "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
   - "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css"
   - "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"
   - "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
 common-ext-js:
-  - href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
-    sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
-  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
-    sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
-    sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
+  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
+    sri: "sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
 common-js:
   - "/assets/js/beautifuljekyll.js"
 ---

diff --git a/_layouts/minimal.html b/_layouts/minimal.html
@@ -2,15 +2,11 @@
 common-css:
   - "/assets/css/beautifuljekyll-minimal.css"
 common-ext-css:
-  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-    sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
+    sri: "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
 common-ext-js:
-  - href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
-    sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
-  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
-    sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-  - href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
-    sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
+  - href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
+    sri: "sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
 ---
 
 <!DOCTYPE html>

diff --git a/assets/css/beautifuljekyll-minimal.css b/assets/css/beautifuljekyll-minimal.css
@@ -11,3 +11,18 @@ footer.footer-min {
   border-top: 1px solid #eeeeee;
   text-align: center;
 }
+
+a {
+  text-decoration: none;  /* no underline */
+}
+a:hover,
+a:focus {
+  text-decoration: underline;  /* underline when hovering */
+}
+
+.navbar-custom .navbar-nav .dropdown-menu .dropdown-item:focus,
+.pagination .page-item .page-link:hover,
+.pagination .page-item .page-link:focus,
+.tag-btn:hover {
+  text-decoration: none;
+}
diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css
@@ -74,10 +74,12 @@ h1, h2, h3, h4 {
 }
 a {
   color: var(--link-col);
+  text-decoration: none;  /* no underline */
 }
 a:hover,
 a:focus {
   color: var(--hover-col);
+  text-decoration: underline;  /* underline when hovering */
 }
 blockquote {
   color: var(--mid-col);
@@ -95,6 +97,7 @@ hr.small {
   border-width: 0.25rem;
   border-color: inherit;
   border-radius: 0.1875rem;
+  opacity: 0.65;
 }
 
 /* fix in-page anchors to not be behind fixed header */
@@ -264,12 +267,12 @@ img {
 }
 
 @media (min-width: 1200px) {
-  .navbar-custom .nav-item.dropdown:hover {
+  .navbar-custom .nav-link.dropdown-toggle:hover {
     background: rgba(0, 0, 0, 0.1);
   }
 }
 
-.navbar-custom .nav-item.dropdown.show {
+.navbar-custom .nav-link.dropdown-toggle.show {
   background: rgba(0, 0, 0, 0.2);
 }
 
@@ -328,7 +331,7 @@ img {
     padding: 0.675rem 0 0.675rem 1rem;
   }
 
-  .navbar-custom .nav-item.dropdown.show {
+  .navbar-custom .nav-link.dropdown-toggle.show {
     background: rgba(0, 0, 0, 0.2);
   }
 
@@ -343,6 +346,7 @@ img {
 .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:hover,
 .navbar-custom .navbar-nav .dropdown-menu .dropdown-item:focus {
   color: var(--hover-col);
+  text-decoration: none;
 }
 
 .navbar-custom .avatar-container {
@@ -644,6 +648,9 @@ footer .footer-custom-content {
 .tag-btn {
   margin: 0.3125rem;
 }
+.tag-btn:hover {
+  text-decoration: none;
+}
 
 #full-tags-list {
   font-family: var(--header-font);
@@ -825,6 +832,7 @@ nav.top-nav-short-permanent ~ header > .intro-header.big-img {
   color: var(--page-col);
   border: 1px solid var(--hover-col);
   background-color: var(--hover-col);
+  text-decoration: none;
 }
 
 /* --- Tables --- */