Skip to content

Commit 34c0e19

Browse files
ReenigneArcherReenigneArcher
committed
build(deps): bump bootstrap from 4.4.1 to 5.5.3
1 parent ac7d602 commit 34c0e19

File tree

3 files changed

+66
-64
lines changed

3 files changed

+66
-64
lines changed

‎_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 %}

‎_layouts/base.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
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/jquery@3.7.1/dist/jquery.slim.min.js"
13+
sri: "sha384-5AkRS45j4ukf+JbWAfHL8P4onPA9p0KwwP7pUdjSQA3ss9edbJUJc/XcYAiheSSz"
14+
- href: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
15+
sri: "sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
16+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
17+
sri: "sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
1818
common-js:
1919
- "/assets/js/beautifuljekyll.js"
2020
---

‎_layouts/minimal.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
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/jquery@3.7.1/dist/jquery.slim.min.js"
9+
sri: "sha384-5AkRS45j4ukf+JbWAfHL8P4onPA9p0KwwP7pUdjSQA3ss9edbJUJc/XcYAiheSSz"
10+
- href: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
11+
sri: "sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
12+
- href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
13+
sri: "sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
1414
---
1515

1616
<!DOCTYPE html>

0 commit comments

Comments
 (0)