Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "Backport navbar rendering from upstream (#422)"" #425

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Revert "Revert "Backport navbar rendering from upstream (#422)"" #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/assets/scss/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
.bd-navbar {
padding: .75rem 0;
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(var(--bd-violet-rgb), 1), rgba(var(--bd-violet-rgb), .95));
box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15), inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: 0 .5rem 1rem rgba($black, .15), inset 0 -1px 0 rgba($white, .15);

&::after {
position: absolute;
inset: 0;
z-index: -1;
display: block;
content: "";
background-image: linear-gradient(rgba(var(--bd-violet-rgb), 1), rgba(var(--bd-violet-rgb), .95));
}

.bi {
width: 1em;
height: 1em;
.bd-navbar-toggle {
@include media-breakpoint-down(lg) {
width: 4.25rem;
}
}

.navbar-toggler {
Expand All @@ -29,7 +38,8 @@
}

.navbar-brand {
transition: .2s ease-in-out transform;
color: $white;
@include transition(transform .2s ease-in-out);

&:hover {
transform: rotate(-5deg) scale(1.1);
Expand Down Expand Up @@ -59,11 +69,11 @@
}

.offcanvas-lg {
background-color: var(--bd-violet);
background-color: var(--bd-violet-bg);
border-left: 0;

@media (max-width: 992px) {
box-shadow: $box-shadow-lg;
@include media-breakpoint-down(lg) {
box-shadow: var(--bs-box-shadow-lg);
}
}

Expand Down Expand Up @@ -104,11 +114,14 @@
.dropdown-menu-end {
--bs-dropdown-min-width: 8rem;
}

hr {
margin: 1rem 0;
}
}

@include color-mode(dark) {
.bd-navbar {
box-shadow: 0 .5rem 1rem rgba($black, .15), inset 0 -1px 0 rgba($white, .15);
}
}

4 changes: 2 additions & 2 deletions src/layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ <h5>Links</h5>
<ul class="list-unstyled">
<li class="mb-2"><a href="{{ .Site.Params.main }}/">Home</a></li>
<li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/">Docs</a></li>
<li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/examples/">Examples</a></li>
<li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/examples">Examples</a></li>
<li class="mb-2"><a href="{{ .Site.Params.icons }}">Icons</a></li>
<li class="mb-2"><a href="{{ .Site.Params.themes }}">Themes</a></li>
<li class="mb-2"><a href="{{ .Site.Params.blog }}">Blog</a></li>
<li class="mb-2"><a href="/">Blog</a></li>
<li class="mb-2"><a href="{{ .Site.Params.swag }}" target="_blank" rel="noopener">Swag Store</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/partials/icons/bootstrap-white-fill.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/layouts/partials/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header class="navbar navbar-expand-lg navbar-dark bd-navbar sticky-top">
<header class="navbar navbar-expand-lg bd-navbar sticky-top">
<nav class="container-xxl bd-gutter flex-wrap flex-lg-nowrap" aria-label="Main navigation">
<div class="d-lg-none" style="width: 2.25rem;"></div>
<div class="d-lg-none" style="width: 2rem;"></div>

<a class="navbar-brand p-0 me-0 me-lg-2" href="/" aria-label="Bootstrap">
{{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block my-1" "width" "40" "height" "32") }}
Expand All @@ -10,7 +10,7 @@
<svg class="bi" width="24" height="24" aria-hidden="true"><use xlink:href="#three-dots"></use></svg>
</button>

<div class="offcanvas-lg offcanvas-end flex-grow-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel">
<div class="offcanvas-lg offcanvas-end flex-grow-1" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel">
<div class="offcanvas-header px-4 pb-0">
<h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas" aria-label="Close" data-bs-target="#bdNavbar"></button>
Expand All @@ -32,7 +32,7 @@ <h5 class="offcanvas-title text-white" id="bdNavbarOffcanvasLabel">Bootstrap</h5
<a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.themes }}" target="_blank" rel="noopener">Themes</a>
</li>
<li class="nav-item col-6 col-lg-auto">
<a class="nav-link py-2 px-0 px-lg-2 active" href="{{ .Site.Params.blog }}">Blog</a>
<a class="nav-link py-2 px-0 px-lg-2 active" href="/">Blog</a>
</li>
</ul>

Expand Down