summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Carstairs <jcarstairs@scottlogic.com>2023-08-15 20:23:31 +0100
committerJoe Carstairs <jcarstairs@scottlogic.com>2023-08-15 20:23:31 +0100
commitc728854bd06f2610b2e0ec30af6d2f08e9c3f4cb (patch)
tree54e236fcef276ea458a8b3a669679321b96babb3
parent124486696f361783e5f24854b3fecd22c63632d9 (diff)
Adds nav links
-rw-r--r--public/main.css37
-rw-r--r--src/components/NavLinks.astro25
-rw-r--r--src/components/Navbar.astro18
-rw-r--r--src/pages/[locale]/index.astro2
4 files changed, 70 insertions, 12 deletions
diff --git a/public/main.css b/public/main.css
index c856e14..1833bca 100644
--- a/public/main.css
+++ b/public/main.css
@@ -418,16 +418,37 @@ footer {
}
nav {
- display: flex;
- flex-direction: column;
- align-items: center;
padding-block-start: var(--spacing-block-sm);
padding-block-end: var(--spacing-block-md);
padding-inline: var(--spacing-inline-sm);
}
+.nav__top-banner {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding-block-end: var(--spacing-block-sm);
+}
+
+.nav__nav-links {
+ padding: 0;
+}
+
+.nav__nav-links li {
+ margin-inline: auto;
+ width: max-content;
+}
+
+.nav__nav-links li {
+ margin-block-end: var(--spacing-block-md);
+}
+
+.nav__nav-links li:last-of-type {
+ margin-block-end: 0;
+}
+
@media (min-width: 50rem) {
- nav {
+ .nav__top-banner {
flex-direction: row;
justify-content: space-between;
align-items: baseline;
@@ -435,6 +456,14 @@ nav {
gap: var(--spacing-inline-xs);
}
+ .nav__nav-links {
+ padding-inline: max(10%, calc((100% - var(--max-width-all-content)) / 2));
+ display: flex;
+ justify-content: space-between;
+ align-items: baseline;
+ gap: var(--spacing-inline-md);
+ }
+
.breadcrumbs {
order: 0;
}
diff --git a/src/components/NavLinks.astro b/src/components/NavLinks.astro
new file mode 100644
index 0000000..a34014e
--- /dev/null
+++ b/src/components/NavLinks.astro
@@ -0,0 +1,25 @@
+---
+import getLocaleFromPath from '$lib/getLocaleFromPath';
+import translate from '$i18n/translate';
+import tNews from '$i18n/translations/pages/news';
+import tFurthsettins from '$i18n/translations/pages/furthsettins';
+import tHame from '$i18n/translations/pages/home';
+
+const locale = getLocaleFromPath(Astro.url.pathname);
+const t = translate(locale);
+---
+
+<ul class="nav__nav-links">
+ <li>
+ <a class="btn" href={`/${locale}/news`}>{t(tNews, { key: 'title' })}</a>
+ </li>
+ <li>
+ <a class="btn" href={`/${locale}/furthsettins`}>{t(tFurthsettins, { key: 'title' })}</a>
+ </li>
+ <li>
+ <a class="btn" href={`/${locale}/#jyne`}>{t(tHame, { key: 'jyne' })}</a>
+ </li>
+ <li>
+ <a class="btn" href={`/${locale}/#contact`}>{t(tHame, { key: 'contact' })}</a>
+ </li>
+</ul>
diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro
index c4e31b2..40e671b 100644
--- a/src/components/Navbar.astro
+++ b/src/components/Navbar.astro
@@ -4,17 +4,21 @@ import SwitchLanguageLink from './SwitchLanguageLink.astro';
import tSite from '$i18n/translations/site';
import translate from '$i18n/translate';
import getLocaleFromPath from '$lib/getLocaleFromPath';
+import NavLinks from './NavLinks.astro';
const locale = getLocaleFromPath(Astro.url.pathname);
const t = translate(locale);
---
<nav>
- <p class="title--small logo">
- <a href="/">
- {t(tSite, { key: 'scots-leid-associe' })}
- </a>
- </p>
- <SwitchLanguageLink />
- <Breadcrumbs />
+ <div class="nav__top-banner">
+ <p class="title--small logo">
+ <a href="/">
+ {t(tSite, { key: 'scots-leid-associe' })}
+ </a>
+ </p>
+ <SwitchLanguageLink />
+ <Breadcrumbs />
+ </div>
+ <NavLinks />
</nav>
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index 30c06fc..6a3af60 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -38,7 +38,7 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);
</div>
</section>
- <section>
+ <section id="jyne">
<h2 set:html={t(tPage, { key: 'jyne' })} />
<h3 set:html={t(tPage, { key: 'why-jyne' })} />