Skip to content

fix: correct invalid grid nesting, heading nesting, and navbar collapse #183

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

Merged
magnus-madsen merged 1 commit into from
Aug 3, 2026
+98 −72
Merged

fix: correct invalid grid nesting, heading nesting, and navbar collapse #183

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
42 changes: 33 additions & 9 deletions src/layouts/Layout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,43 @@ import '../styles/global.css';
<div class="container page">
<nav class="navbar navbar-dark bg-info navbar-expand-md menu shadow-sm mb-4">
<div class="container-fluid">
<ul class="navbar-nav mr-lg-auto">
{navLinks.map(({ href, label }) => (
<li class="nav-item pl-1 pr-1">
<a class={`nav-link${currentPath === href ? " active font-weight-bold" : ""}`} href={href}>
{label}
</a>
</li>
))}
</ul>
<button
class="navbar-toggler"
type="button"
aria-controls="main-nav"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="main-nav">
<ul class="navbar-nav mr-lg-auto">
{navLinks.map(({ href, label }) => (
<li class="nav-item pl-1 pr-1">
<a class={`nav-link${currentPath === href ? " active font-weight-bold" : ""}`} href={href}>
{label}
</a>
</li>
))}
</ul>
</div>
</div>
</nav>

<slot />
</div>

<script>
// Bootstrap's collapse JS needs jQuery, which the site does not load. Its
// CSS hides .collapse:not(.show) below the md breakpoint, so this script
// only toggles that class. Above md, .navbar-collapse is display:flex
// !important, so a stale .show is harmless when resizing back up.
const toggler = document.querySelector<HTMLButtonElement>(".navbar-toggler");
const target = document.getElementById("main-nav");
toggler?.addEventListener("click", () => {
const open = target?.classList.toggle("show") ?? false;
toggler.setAttribute("aria-expanded", String(open));
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion src/pages/blog.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Layout from '../layouts/Layout.astro';
<h1>Blog</h1>
<p>The Flix Blog is now available at:</p>
<div class="mt-3">
<a href="https://blog.flix.dev/"><h2>https://blog.flix.dev/</h2></a>
<h2><a href="https://blog.flix.dev/">https://blog.flix.dev/</a></h2>
</div>
</div>
</div>
Expand Down
126 changes: 64 additions & 62 deletions src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,85 +994,87 @@ const vscodeSlides = [

<hr class="mb-4" />

<div class="row mb-4">
<div class="row">
<div class="col-md-12">
<h2>Sponsors and Funding</h2>
</div>
<div class="row">
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/dff.png"
class="card-img"
alt="Independent Research Fund Denmark"
loading="lazy"
/>
</div>
</div>

<div class="row mb-4">
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/dff.png"
class="card-img"
alt="Independent Research Fund Denmark"
loading="lazy"
/>
</div>
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/direc.png"
class="card-img"
alt="Digital Research Centre Denmark"
loading="lazy"
/>
</div>
</div>
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/direc.png"
class="card-img"
alt="Digital Research Centre Denmark"
loading="lazy"
/>
</div>
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/amazon-science.png"
class="card-img"
alt="Amazon Research Award"
loading="lazy"
/>
</div>
</div>
<div class="col">
<div class="card border-0 p-3">
<img
src="/logo/amazon-science.png"
class="card-img"
alt="Amazon Research Award"
loading="lazy"
/>
</div>
<div class="col">
<div class="card border-0 p-3">
<img src="/logo/stibo.png" class="card-img" alt="StiboFonden" loading="lazy" />
</div>
</div>
<div class="col">
<div class="card border-0 p-3">
<img src="/logo/stibo.png" class="card-img" alt="StiboFonden" loading="lazy" />
</div>
</div>
</div>

<hr class="mb-4" />

<div class="row mb-4">
<div class="row">
<div class="col-md-12">
<h2>Collaborators</h2>
</div>
<div class="row">
<div class="col-md-3">
<div class="card border-0 p-3">
<img
src="/logo/aarhusu.png"
class="card-img"
alt="Aarhus University"
loading="lazy"
/>
</div>
</div>

<div class="row mb-4">
<div class="col-md-3">
<div class="card border-0 p-3">
<img
src="/logo/aarhusu.png"
class="card-img"
alt="Aarhus University"
loading="lazy"
/>
</div>
<div class="col-md-4">
<div class="card border-0 p-3">
<img
src="/logo/uwaterloo.png"
class="card-img"
alt="University of Waterloo"
loading="lazy"
/>
</div>
</div>
<div class="col-md-4">
<div class="card border-0 p-3">
<img
src="/logo/uwaterloo.png"
class="card-img"
alt="University of Waterloo"
loading="lazy"
/>
</div>
<div class="col-md-3">
<div class="card border-0 p-3">
<img
src="/logo/tubingen.png"
class="card-img"
alt="University of Tubingen"
loading="lazy"
/>
</div>
</div>
<div class="col-md-3">
<div class="card border-0 p-3">
<img
src="/logo/tubingen.png"
class="card-img"
alt="University of Tubingen"
loading="lazy"
/>
</div>
</div>
</div>
Expand Down