Skip to content

Commit 727431d

Browse files
committed
refactor layout and navigation components; improve styling and structure
1 parent d5c4468 commit 727431d

File tree

4 files changed

+37
-36
lines changed

4 files changed

+37
-36
lines changed

src/app.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
%sveltekit.head%
8-
</head>
93

10-
<body data-sveltekit-preload-data="hover" data-bs-theme="dark">
11-
<div style="display: contents">
12-
<main>%sveltekit.body%</main>
13-
</div>
14-
</body>
15-
</html>
4+
<head>
5+
<meta charset="utf-8" />
6+
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
8+
%sveltekit.head%
9+
</head>
10+
11+
<body data-sveltekit-preload-data="hover" data-bs-theme="dark">
12+
<div style="display: contents" class="mainContainer">%sveltekit.body%</div>
13+
</body>
14+
15+
</html>

src/lib/components/Navigation.svelte

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@
5555
{/snippet}
5656
5757
<header>
58-
<nav class="navbar navbar-expand-sm bg-body-tertiary shadow-sm fixed-top">
58+
<nav
59+
class="navbar navbar-expand-sm shadow-sm fixed-top"
60+
style="background-color: rgba(var(--bs-tertiary-bg-rgb), 0.95)"
61+
>
5962
<div class="container px-3 py-2">
6063
<a
6164
onclick={collapseBootstrapMenu}
@@ -77,24 +80,8 @@
7780
<span class="navbar-toggler-icon"></span>
7881
</button>
7982
<div class="collapse navbar-collapse" id="navbarNavDropdown">
80-
<ul class="navbar-nav gap-3 pt-lg-0 pt-3">
83+
<ul class="navbar-nav gap-3">
8184
{@render navigationLinks(navLinks)}
82-
<!-- <li class="nav-item dropdown">
83-
<a
84-
class="nav-link dropdown-toggle"
85-
href="#top"
86-
role="button"
87-
data-bs-toggle="dropdown"
88-
aria-expanded="false"
89-
>
90-
Dropdown link
91-
</a>
92-
<ul class="dropdown-menu">
93-
<li><a class="dropdown-item" href="#top">Action</a></li>
94-
<li><a class="dropdown-item" href="#top">Another action</a></li>
95-
<li><a class="dropdown-item" href="#top">Something else here</a></li>
96-
</ul>
97-
</li> -->
9885
</ul>
9986
</div>
10087
</div>

src/lib/styles/style.scss

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
.svh-100 {
2-
align-items: center;
1+
body {
2+
min-height: 100svh;
33
display: flex;
4-
min-height: calc(100svh - 80px - 56px);
4+
flex-direction: column;
5+
header {
6+
width: 100%;
7+
}
8+
main {
9+
width: 100%;
10+
}
11+
footer {
12+
width: 100%;
13+
margin-top: auto;
14+
}
515
}
16+
17+
// .svh-100 {
18+
// min-height: 100svh;
19+
// }

src/routes/+layout.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</script>
1010

1111
<LoadingAnimation />
12-
<Navigation />
1312

14-
<div class="svh-100">
13+
<Navigation />
14+
<main>
1515
{@render children()}
16-
</div>
16+
</main>
1717
<Footer />

0 commit comments

Comments
 (0)