Skip to content

Commit 4487c4a

Browse files
ReenigneArcherReenigneArcher
committed
build(deps): bump bootstrap from 4.4.1 to 5.5.3
1 parent 3920be6 commit 4487c4a

8 files changed

+149
-154
lines changed

‎_includes/footer-scripts.html

+1-10
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@
66

77
{% if layout.common-js %}
88
{% for js in layout.common-js %}
9-
<!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
10-
{% if js contains 'jquery' %}
11-
<script>
12-
if (typeof jQuery == 'undefined') {
13-
document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
14-
}
15-
</script>
16-
{% else %}
17-
<script src="{{ js | relative_url }}"></script>
18-
{% endif %}
9+
<script src="{{ js | relative_url }}"></script>
1910
{% endfor %}
2011
{% endif %}
2112

‎_includes/nav.html

+50-48
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,64 @@
11
<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 %}">
2+
<div class="container-fluid">
23

3-
{%- if site.title-img -%}
4-
<a class="navbar-brand navbar-brand-logo" href="{{ '/' | absolute_url }}"><img alt="{{ site.title }} Logo" src="{{ site.title-img | relative_url}}"/></a>
5-
{%- elsif site.title -%}
6-
<a class="navbar-brand" href="{{ '/' | absolute_url }}">{{ site.title }}</a>
7-
{%- endif -%}
4+
{%- if site.title-img -%}
5+
<a class="navbar-brand navbar-brand-logo" href="{{ '/' | absolute_url }}"><img alt="{{ site.title }} Logo" src="{{ site.title-img | relative_url}}"/></a>
6+
{%- elsif site.title -%}
7+
<a class="navbar-brand" href="{{ '/' | absolute_url }}">{{ site.title }}</a>
8+
{%- endif -%}
89

9-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
10-
<span class="navbar-toggler-icon"></span>
11-
</button>
10+
<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">
11+
<span class="navbar-toggler-icon"></span>
12+
</button>
1213

13-
<div class="collapse navbar-collapse" id="main-navbar">
14-
<ul class="navbar-nav ml-auto">
15-
{%- for link in site.navbar-links -%}
16-
{%- if link[1].first %}
17-
<li class="nav-item dropdown">
18-
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ link[0] }}</a>
19-
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
20-
{%- for childlink in link[1] -%}
21-
{%- for linkparts in childlink %}
22-
<a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
23-
{%- endfor -%}
24-
{%- endfor %}
25-
</div>
26-
</li>
27-
{% else %}
14+
<div class="collapse navbar-collapse" id="main-navbar">
15+
<ul class="navbar-nav ms-auto">
16+
{%- for link in site.navbar-links -%}
17+
{%- if link[1].first %}
18+
<li class="nav-item dropdown">
19+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">{{ link[0] }}</a>
20+
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
21+
{%- for childlink in link[1] -%}
22+
{%- for linkparts in childlink %}
23+
<a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
24+
{%- endfor -%}
25+
{%- endfor %}
26+
</div>
27+
</li>
28+
{% else %}
29+
<li class="nav-item">
30+
<a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
31+
</li>
32+
{%- endif -%}
33+
{%- endfor -%}
34+
{% if site.post_search %}
2835
<li class="nav-item">
29-
<a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
36+
<a class="nav-link" id="nav-search-link" href="#" title="Search">
37+
<span id="nav-search-icon" class="fa fa-search"></span>
38+
<span id="nav-search-text">Search</span>
39+
</a>
3040
</li>
3141
{%- endif -%}
32-
{%- endfor -%}
33-
{% if site.post_search %}
34-
<li class="nav-item">
35-
<a class="nav-link" id="nav-search-link" href="#" title="Search">
36-
<span id="nav-search-icon" class="fa fa-search"></span>
37-
<span id="nav-search-text">Search</span>
38-
</a>
39-
</li>
40-
{%- endif -%}
41-
</ul>
42-
</div>
42+
</ul>
43+
</div>
4344

44-
{% if site.navbar-extra %}
45-
{% for file in site.navbar-extra %}
46-
{% include {{ file }} %}
47-
{% endfor %}
48-
{% endif %}
45+
{% if site.navbar-extra %}
46+
{% for file in site.navbar-extra %}
47+
{% include {{ file }} %}
48+
{% endfor %}
49+
{% endif %}
4950

50-
{% if site.avatar and page.show-avatar != false %}
51-
<div class="avatar-container">
52-
<div class="avatar-img-border">
53-
<a href="{{ '/' | absolute_url }}">
54-
<img alt="Navigation bar avatar" class="avatar-img" src="{{ site.avatar | relative_url }}" />
55-
</a>
51+
{% if site.avatar and page.show-avatar != false %}
52+
<div class="avatar-container">
53+
<div class="avatar-img-border">
54+
<a href="{{ '/' | absolute_url }}">
55+
<img alt="Navigation bar avatar" class="avatar-img" src="{{ site.avatar | relative_url }}" />
56+
</a>
57+
</div>
5658
</div>
57-
</div>
58-
{% endif %}
59+
{% endif %}
5960

61+
</div>
6062
</nav>
6163

6264
{% include search.html %}

‎_includes/staticman-comments.html

-6
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ <h3 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_labe
7272
</div>
7373

7474
<!-- Load script to handle comment form submission -->
75-
<!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
76-
<script>
77-
if (typeof jQuery == 'undefined') {
78-
document.write('<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></scr' + 'ipt>');
79-
}
80-
</script>
8175
<script src="{{ "/assets/js/staticman.js" | relative_url }}"></script>
8276
</div>
8377
{% endif %}

‎_layouts/base.html

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
- "/assets/css/bootstrap-social.css"
44
- "/assets/css/beautifuljekyll.css"
55
common-ext-css:
6-
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
7-
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
6+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
7+
sri: "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
88
- "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css"
99
- "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"
1010
- "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
1111
common-ext-js:
12-
- href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
13-
sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
14-
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
15-
sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
16-
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
17-
sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
12+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
13+
sri: "sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
1814
common-js:
1915
- "/assets/js/beautifuljekyll.js"
2016
---

‎_layouts/minimal.html

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
common-css:
33
- "/assets/css/beautifuljekyll-minimal.css"
44
common-ext-css:
5-
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
6-
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
5+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
6+
sri: "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
77
common-ext-js:
8-
- href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
9-
sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
10-
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
11-
sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
12-
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
13-
sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
8+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
9+
sri: "sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
1410
---
1511

1612
<!DOCTYPE html>

‎assets/css/beautifuljekyll.css

+6-3
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ h1, h2, h3, h4 {
7474
}
7575
a {
7676
color: var(--link-col);
77+
text-decoration: none; /* no underline */
7778
}
7879
a:hover,
7980
a:focus {
8081
color: var(--hover-col);
82+
text-decoration: underline; /* underline when hovering */
8183
}
8284
blockquote {
8385
color: var(--mid-col);
@@ -95,6 +97,7 @@ hr.small {
9597
border-width: 0.25rem;
9698
border-color: inherit;
9799
border-radius: 0.1875rem;
100+
opacity: 0.65;
98101
}
99102

100103
/* fix in-page anchors to not be behind fixed header */
@@ -264,12 +267,12 @@ img {
264267
}
265268

266269
@media (min-width: 1200px) {
267-
.navbar-custom .nav-item.dropdown:hover {
270+
.navbar-custom .nav-link.dropdown-toggle:hover {
268271
background: rgba(0, 0, 0, 0.1);
269272
}
270273
}
271274

272-
.navbar-custom .nav-item.dropdown.show {
275+
.navbar-custom .nav-link.dropdown-toggle.show {
273276
background: rgba(0, 0, 0, 0.2);
274277
}
275278

@@ -328,7 +331,7 @@ img {
328331
padding: 0.675rem 0 0.675rem 1rem;
329332
}
330333

331-
.navbar-custom .nav-item.dropdown.show {
334+
.navbar-custom .nav-link.dropdown-toggle.show {
332335
background: rgba(0, 0, 0, 0.2);
333336
}
334337

0 commit comments

Comments
 (0)