Skip to content

Commit

Permalink
Use bootstrap icons in templates when possible
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Mar 7, 2024
1 parent ac66b7a commit 8b5f8da
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 35 deletions.
11 changes: 6 additions & 5 deletions docs/assets/js/color-modes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
}

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

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

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

if (focus) {
Expand Down
1 change: 0 additions & 1 deletion docs/layouts/partials/icons/github.svg
View file

This file was deleted.

1 change: 0 additions & 1 deletion docs/layouts/partials/icons/opencollective.svg
View file

This file was deleted.

1 change: 0 additions & 1 deletion docs/layouts/partials/icons/twitter.svg
View file

This file was deleted.

40 changes: 13 additions & 27 deletions docs/layouts/partials/navbar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
<ul class="navbar-nav flex-row flex-wrap ms-md-auto">
<li class="nav-item col-6 col-lg-auto">
<a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.github_org }}" target="_blank" rel="noopener">
{{ partial "icons/github.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
<i class="bi bi-github align-top" aria-hidden="true"></i>
<small class="d-lg-none ms-2">GitHub</small>
</a>
</li>
<li class="nav-item col-6 col-lg-auto">
<a class="nav-link py-2 px-0 px-lg-2" href="https://twitter.com/{{ .Site.Params.twitter }}" target="_blank" rel="noopener">
{{ partial "icons/twitter.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
<i class="bi bi-twitter align-top" aria-hidden="true"></i>
<small class="d-lg-none ms-2">Twitter</small>
</a>
</li>
<li class="nav-item col-6 col-lg-auto">
<a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener">
{{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }}
<i class="bi bi-opencollective align-top" aria-hidden="true"></i>
<small class="d-lg-none ms-2">Open Collective</small>
</a>
</li>
Expand All @@ -64,50 +64,36 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
</li>

<li class="nav-item dropdown">
<!-- TODO use the icons -->
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
<symbol id="circle-half" viewBox="0 0 16 16">
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"/>
</symbol>
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
<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"/>
<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"/>
</symbol>
<symbol id="sun-fill" viewBox="0 0 16 16">
<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"/>
</symbol>
</svg>

<button class="btn btn-link nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
id="bd-theme"
type="button"
aria-expanded="false"
data-bs-toggle="dropdown"
data-bs-display="static"
aria-label="Toggle theme (auto)">
<svg class="bi my-1 theme-icon-active"><use href="#circle-half"></use></svg>
<i class="bi bi-circle-half theme-icon-active" aria-hidden="true"></i>
<span class="d-lg-none ms-2" id="bd-theme-text">Toggle theme</span>
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text">
<li>
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
<svg class="bi me-2 opacity-50"><use href="#sun-fill"></use></svg>
<button type="button" class="dropdown-item d-flex" data-bs-theme-value="light" aria-pressed="false">
<i class="bi bi-sun-fill me-2 opacity-50" aria-hidden="true"></i>
Light
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
</button>
</li>
<li>
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
<svg class="bi me-2 opacity-50"><use href="#moon-stars-fill"></use></svg>
<button type="button" class="dropdown-item d-flex" data-bs-theme-value="dark" aria-pressed="false">
<i class="bi bi-moon-stars-fill me-2 opacity-50" aria-hidden="true"></i>
Dark
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
</button>
</li>
<li>
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
<svg class="bi me-2 opacity-50"><use href="#circle-half"></use></svg>
<button type="button" class="dropdown-item d-flex active" data-bs-theme-value="auto" aria-pressed="true">
<i class="bi bi-circle-half me-2 opacity-50" aria-hidden="true"></i>
Auto
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
<i class="bi bi-check2 ms-auto d-none" aria-hidden="true"></i>
</button>
</li>
</ul>
Expand Down

0 comments on commit 8b5f8da

Please sign in to comment.