Skip to content

Commit 96e78b2

Browse files
XhmikosRXhmikosR
committed
docs: backport from upstream
1 parent 4c51cc4 commit 96e78b2

File tree

6 files changed

+35
-31
lines changed

6 files changed

+35
-31
lines changed

‎docs/content/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ composer require twbs/bootstrap-icons
3535
Include the icon fonts stylesheet—in your website `<head>` or via `@import` in CSS—from jsDelivr and get started in seconds. [See icon font docs](#icon-font) for examples.
3636

3737
{{< highlight html >}}
38-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@{{< param version >}}/font/bootstrap-icons.min.css">
38+
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@{{< param version >}}/font/bootstrap-icons.min.css" rel="stylesheet">
3939
{{< /highlight >}}
4040

4141
{{< highlight css >}}

‎docs/layouts/partials/favicons.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ "<!-- Favicons -->" | safeHTML }}
21
<link rel="apple-touch-icon" href="/assets/img/favicons/apple-touch-icon.png" sizes="180x180">
32
<link rel="icon" href="/assets/img/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
43
<link rel="icon" href="/assets/img/favicons/favicon-16x16.png" sizes="16x16" type="image/png">

‎docs/layouts/partials/footer.html‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<div class="container py-4 py-md-5 px-4 px-md-3 text-body-secondary">
33
<div class="row">
44
<div class="col-lg-3 mb-3">
5-
<a class="d-inline-flex align-items-center mb-2 text-body-secondary text-decoration-none" href="/" aria-label="Bootstrap">
5+
<a class="d-inline-flex align-items-center mb-2 text-body-emphasis text-decoration-none" href="/" aria-label="Bootstrap">
66
{{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block me-2" "width" "40" "height" "32") }}
77
<span class="fs-5">Bootstrap</span>
88
</a>
99
<ul class="list-unstyled small">
1010
<li class="mb-2">Designed and built with all the love in the world by the <a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/about/team/">Bootstrap team</a> with the help of <a href="{{ .Site.Params.repo }}/graphs/contributors">our contributors</a>.</li>
1111
<li class="mb-2">Code licensed <a href="{{ .Site.Params.repo }}/blob/main/LICENSE" target="_blank" rel="license noopener">MIT</a>, docs <a href="https://creativecommons.org/licenses/by/3.0/" target="_blank" rel="license noopener">CC BY 3.0</a>.</li>
12+
<li class="mb-2">Currently v{{ .Site.Params.version }}.</li>
1213
</ul>
1314
</div>
1415
<div class="col-6 col-lg-2 offset-lg-1 mb-3">
@@ -20,7 +21,7 @@ <h5>Links</h5>
2021
<li class="mb-2"><a href="{{ .Site.Params.icons }}">Icons</a></li>
2122
<li class="mb-2"><a href="{{ .Site.Params.themes }}">Themes</a></li>
2223
<li class="mb-2"><a href="{{ .Site.Params.blog }}">Blog</a></li>
23-
<li class="mb-2"><a href="{{ .Site.Params.swag }}">Swag Store</a></li>
24+
<li class="mb-2"><a href="{{ .Site.Params.swag }}" target="_blank" rel="noopener">Swag Store</a></li>
2425
</ul>
2526
</div>
2627
<div class="col-6 col-lg-2 mb-3">
@@ -36,21 +37,21 @@ <h5>Guides</h5>
3637
<div class="col-6 col-lg-2 mb-3">
3738
<h5>Projects</h5>
3839
<ul class="list-unstyled">
39-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap">Bootstrap 5</a></li>
40-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/tree/v4-dev">Bootstrap 4</a></li>
41-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/icons">Icons</a></li>
42-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/rfs">RFS</a></li>
43-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap-npm-starter">npm starter</a></li>
40+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap" target="_blank" rel="noopener">Bootstrap 5</a></li>
41+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/tree/v4-dev" target="_blank" rel="noopener">Bootstrap 4</a></li>
42+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/icons" target="_blank" rel="noopener">Icons</a></li>
43+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/rfs" target="_blank" rel="noopener">RFS</a></li>
44+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/examples/" target="_blank" rel="noopener">Examples repo</a></li>
4445
</ul>
4546
</div>
4647
<div class="col-6 col-lg-2 mb-3">
4748
<h5>Community</h5>
4849
<ul class="list-unstyled">
49-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/issues">Issues</a></li>
50-
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/discussions">Discussions</a></li>
51-
<li class="mb-2"><a href="https://github.com/sponsors/twbs">Corporate sponsors</a></li>
52-
<li class="mb-2"><a href="{{ .Site.Params.opencollective }}">Open Collective</a></li>
53-
<li class="mb-2"><a href="https://stackoverflow.com/questions/tagged/bootstrap-5">Stack Overflow</a></li>
50+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/issues" target="_blank" rel="noopener">Issues</a></li>
51+
<li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/discussions" target="_blank" rel="noopener">Discussions</a></li>
52+
<li class="mb-2"><a href="https://github.com/sponsors/twbs" target="_blank" rel="noopener">Corporate sponsors</a></li>
53+
<li class="mb-2"><a href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener">Open Collective</a></li>
54+
<li class="mb-2"><a href="https://stackoverflow.com/questions/tagged/bootstrap-5" target="_blank" rel="noopener">Stack Overflow</a></li>
5455
</ul>
5556
</div>
5657
</div>

‎docs/layouts/partials/navbar.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<i class="bi bi-three-dots" aria-hidden="true"></i>
1111
</button>
1212

13-
<div class="offcanvas-lg offcanvas-end flex-grow-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel">
13+
<div class="offcanvas-lg offcanvas-end flex-grow-1" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel" data-bs-scroll="true">
1414
<div class="offcanvas-header px-4 pb-0">
1515
<h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5>
1616
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close" data-bs-target="#bdNavbar"></button>
@@ -64,6 +64,7 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
6464
</li>
6565

6666
<li class="nav-item dropdown">
67+
<!-- TODO use the icons -->
6768
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
6869
<symbol id="circle-half" viewBox="0 0 16 16">
6970
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"/>
@@ -90,28 +91,27 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
9091
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text">
9192
<li>
9293
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
93-
<svg class="bi me-2 opacity-50 theme-icon"><use href="#sun-fill"></use></svg>
94+
<svg class="bi me-2 opacity-50"><use href="#sun-fill"></use></svg>
9495
Light
9596
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
9697
</button>
9798
</li>
9899
<li>
99100
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
100-
<svg class="bi me-2 opacity-50 theme-icon"><use href="#moon-stars-fill"></use></svg>
101+
<svg class="bi me-2 opacity-50"><use href="#moon-stars-fill"></use></svg>
101102
Dark
102103
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
103104
</button>
104105
</li>
105106
<li>
106107
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
107-
<svg class="bi me-2 opacity-50 theme-icon"><use href="#circle-half"></use></svg>
108+
<svg class="bi me-2 opacity-50"><use href="#circle-half"></use></svg>
108109
Auto
109110
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
110111
</button>
111112
</li>
112113
</ul>
113114
</li>
114-
115115
</ul>
116116
</div>
117117
</div>

‎docs/layouts/partials/social.html‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
{{ "<!-- Twitter -->" | safeHTML }}
1+
{{- $pageTitle := .Title | default .Site.Title | markdownify -}}
2+
{{- $pageDescription := .Page.Params.description | default .Site.Params.description | markdownify -}}
3+
{{- $socialImagePath := .Site.Params.social_image_path -}}
4+
25
<meta name="twitter:card" content="{{ if .IsHome }}summary_large_image{{ else }}summary{{ end }}">
36
<meta name="twitter:site" content="@{{ .Site.Params.twitter }}">
47
<meta name="twitter:creator" content="@{{ .Site.Params.twitter }}">
5-
<meta name="twitter:title" content="{{ .Title | default .Site.Title | markdownify }}">
6-
<meta name="twitter:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}">
7-
<meta name="twitter:image" content="{{ .Site.Params.social_image_path | absURL }}">
8+
<meta name="twitter:title" content="{{ $pageTitle }}">
9+
<meta name="twitter:description" content="{{ $pageDescription }}">
10+
<meta name="twitter:image" content="{{ $socialImagePath | absURL }}">
811

9-
{{ "<!-- Facebook -->" | safeHTML }}
1012
<meta property="og:url" content="{{ .Permalink }}">
11-
<meta property="og:title" content="{{ .Title | default .Site.Title | markdownify }}">
12-
<meta property="og:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}">
13+
<meta property="og:title" content="{{ $pageTitle }}">
14+
<meta property="og:description" content="{{ $pageDescription }}">
1315
<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
14-
<meta property="og:image" content="{{ .Site.Params.social_image_path | absURL }}">
16+
<meta property="og:image" content="{{ $socialImagePath | absURL }}">
1517
<meta property="og:image:type" content="image/png">
16-
<meta property="og:image:width" content="1000">
17-
<meta property="og:image:height" content="500">
18+
{{ with (imageConfig (path.Join "docs/static" $socialImagePath)) -}}
19+
<meta property="og:image:width" content="{{ .Width }}">
20+
<meta property="og:image:height" content="{{ .Height }}">
21+
{{- end }}

‎docs/layouts/partials/stylesheet.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<link rel="stylesheet" href="/assets/font/bootstrap-icons.min.css">
1+
<link href="/assets/font/bootstrap-icons.min.css" rel="stylesheet">
22

33
{{- $sassOptions := dict "targetPath" "assets/css/docs.css" "precision" 6 -}}
44
{{- $postcssOptions := dict "use" "autoprefixer" "noMap" true -}}
@@ -9,4 +9,4 @@
99

1010
{{- $style := resources.Get "scss/docs.scss" | toCSS $sassOptions | postCSS $postcssOptions -}}
1111

12-
<link rel="stylesheet" href="{{ $style.Permalink | relURL }}">
12+
<link href="{{ $style.Permalink | relURL }}" rel="stylesheet">

0 commit comments

Comments
 (0)