Skip to content

Commit a212110

Browse files
XhmikosRXhmikosR
committed
Use bootstrap icons in templates when possible
1 parent ac66b7a commit a212110

File tree

5 files changed

+19
-35
lines changed

5 files changed

+19
-35
lines changed

‎docs/assets/js/color-modes.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
}
3636

3737
const themeSwitcherText = document.querySelector('#bd-theme-text')
38-
const activeThemeIcon = document.querySelector('.theme-icon-active use')
39-
const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
40-
const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')
38+
const activeThemeIcon = document.querySelector('.theme-icon-active')
39+
const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"] i`)
40+
const initialIconOfActiveBtn = [...btnToActive.classList].filter(cl => cl.startsWith('bi-')).join('')
4141

4242
document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
4343
element.classList.remove('active')
@@ -46,8 +46,9 @@
4646

4747
btnToActive.classList.add('active')
4848
btnToActive.setAttribute('aria-pressed', 'true')
49-
activeThemeIcon.setAttribute('href', svgOfActiveBtn)
50-
const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
49+
const currentIconOfActiveBtn = [...activeThemeIcon.classList].filter(cl => cl.startsWith('bi-')).join('')
50+
activeThemeIcon.classList.replace(currentIconOfActiveBtn, initialIconOfActiveBtn)
51+
const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.parentElement.dataset.bsThemeValue})`
5152
themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
5253

5354
if (focus) {

‎docs/layouts/partials/icons/github.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/layouts/partials/icons/opencollective.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/layouts/partials/icons/twitter.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/layouts/partials/navbar.html‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
4141
<ul class="navbar-nav flex-row flex-wrap ms-md-auto">
4242
<li class="nav-item col-6 col-lg-auto">
4343
<a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.github_org }}" target="_blank" rel="noopener">
44-
{{ partial "icons/github.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
44+
<i class="bi bi-github align-top" aria-hidden="true"></i>
4545
<small class="d-lg-none ms-2">GitHub</small>
4646
</a>
4747
</li>
4848
<li class="nav-item col-6 col-lg-auto">
4949
<a class="nav-link py-2 px-0 px-lg-2" href="https://twitter.com/{{ .Site.Params.twitter }}" target="_blank" rel="noopener">
50-
{{ partial "icons/twitter.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
50+
<i class="bi bi-twitter align-top" aria-hidden="true"></i>
5151
<small class="d-lg-none ms-2">Twitter</small>
5252
</a>
5353
</li>
5454
<li class="nav-item col-6 col-lg-auto">
5555
<a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener">
56-
{{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
56+
<i class="bi bi-opencollective align-top" aria-hidden="true"></i>
5757
<small class="d-lg-none ms-2">Open Collective</small>
5858
</a>
5959
</li>
@@ -64,50 +64,36 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
6464
</li>
6565

6666
<li class="nav-item dropdown">
67-
<!-- TODO use the icons -->
68-
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
69-
<symbol id="circle-half" viewBox="0 0 16 16">
70-
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"/>
71-
</symbol>
72-
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
73-
<path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"/>
74-
<path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z"/>
75-
</symbol>
76-
<symbol id="sun-fill" viewBox="0 0 16 16">
77-
<path d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"/>
78-
</symbol>
79-
</svg>
80-
8167
<button class="btn btn-link nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
8268
id="bd-theme"
8369
type="button"
8470
aria-expanded="false"
8571
data-bs-toggle="dropdown"
8672
data-bs-display="static"
8773
aria-label="Toggle theme (auto)">
88-
<svg class="bi my-1 theme-icon-active"><use href="#circle-half"></use></svg>
74+
<i class="bi bi-circle-half theme-icon-active" aria-hidden="true"></i>
8975
<span class="d-lg-none ms-2" id="bd-theme-text">Toggle theme</span>
9076
</button>
9177
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text">
9278
<li>
93-
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
94-
<svg class="bi me-2 opacity-50"><use href="#sun-fill"></use></svg>
79+
<button type="button" class="dropdown-item d-flex" data-bs-theme-value="light" aria-pressed="false">
80+
<i class="bi bi-sun-fill me-2 opacity-50" aria-hidden="true"></i>
9581
Light
96-
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
82+
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
9783
</button>
9884
</li>
9985
<li>
100-
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
101-
<svg class="bi me-2 opacity-50"><use href="#moon-stars-fill"></use></svg>
86+
<button type="button" class="dropdown-item d-flex" data-bs-theme-value="dark" aria-pressed="false">
87+
<i class="bi bi-moon-stars-fill me-2 opacity-50" aria-hidden="true"></i>
10288
Dark
103-
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
89+
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
10490
</button>
10591
</li>
10692
<li>
107-
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
108-
<svg class="bi me-2 opacity-50"><use href="#circle-half"></use></svg>
93+
<button type="button" class="dropdown-item d-flex active" data-bs-theme-value="auto" aria-pressed="true">
94+
<i class="bi bi-circle-half me-2 opacity-50" aria-hidden="true"></i>
10995
Auto
110-
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
96+
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
11197
</button>
11298
</li>
11399
</ul>

0 commit comments

Comments
 (0)