Merge pull request #52 from Ultramarine-Linux/link-to-merch

feat: add merch link & other navbar updates
Ultramarine-Linux · Aug 20, 2024 · 2e320e7 · 2e320e7
2 parents 8f2f199 + c48879f
commit 2e320e7
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 72 deletions.
diff --git a/src/components/Header.astro b/src/components/Header.astro
@@ -3,78 +3,110 @@ import ThemeSwitch from "./ThemeSwitch.vue";
 ---
 
 <header
-  id="nav"
-  class="flex flex-row justify-between items-center max-w-screen-2xl px-6 md:px-16 py-4 mx-auto text-gray-600 dark:text-gray-200 sticky top-0 z-50 bg-clip-padding bg-gray-100 bg-opacity-30 dark:bg-gray-900 dark:bg-opacity-40 backdrop-filter backdrop-blur-xl"
+    id="nav"
+    class="flex flex-row justify-between items-center max-w-screen-2xl px-6 md:px-16 py-4 mx-auto text-gray-600 dark:text-gray-200 sticky top-0 z-50 bg-clip-padding bg-gray-100 bg-opacity-30 dark:bg-gray-900 dark:bg-opacity-40 backdrop-filter backdrop-blur-xl"
 >
-  <div class="flex flex-row items-center gap-8">
-    <a
-      href="/"
-      class="flex flex-row items-center font-bold hover:text-blue-600 dark:hover:text-blue-200"
-      aria-label="Navigate to home page"
+    <div class="flex flex-row items-center gap-8">
+        <a
+            href="/"
+            class="flex flex-row items-center font-bold hover:text-blue-600 dark:hover:text-blue-200"
+            aria-label="Navigate to home page"
+        >
+            <div class="w-11 h-auto mr-2">
+                <img src="/ultramarine-logo.svg" alt="Ultramarine Linux Logo" />
+            </div>
+        </a>
+        <a
+            href="https://wiki.ultramarine-linux.org"
+            class="hover:text-blue-600 dark:hover:text-blue-500"
+            target="_blank"
+            rel="noopener noreferrer"
+            >Wiki
+        </a>
+        <a
+            href="https://github.com/Ultramarine-Linux/packages"
+            class="hover:text-blue-600 dark:hover:text-blue-500 md:block hidden"
+            target="_blank"
+            rel="noopener noreferrer"
+            >Packages
+        </a>
+        <a
+            href="https://fyra.bigcartel.com/"
+            class="hover:text-blue-600 dark:hover:text-blue-500 md:block hidden"
+            target="_blank"
+            rel="noopener noreferrer"
+            >Merch
+        </a>
+        <a
+            href="https://blog.fyralabs.com/"
+            class="hover:text-blue-600 dark:hover:text-blue-500 md:block hidden"
+            target="_blank"
+            rel="noopener noreferrer"
+            >Blog
+        </a>
+    </div>
+    <div
+        class="links-right flex flex-row gap-8 justify-center align-middle items-center font-semibold"
     >
-      <div class="w-11 h-auto mr-2">
-        <img src="/ultramarine-logo.svg" alt="Ultramarine Linux Logo">
-      </div>
-    </a>
-    <a
-      href="https://wiki.ultramarine-linux.org"
-      class="hover:text-blue-600 dark:hover:text-blue-500"
-      target="_blank"
-      rel="noopener noreferrer"
-      >Wiki
-    </a>
-    <a
-      href="https://github.com/Ultramarine-Linux/ultramarine-pkgs"
-      class="hover:text-blue-600 dark:hover:text-blue-500 md:block hidden"
-      target="_blank"
-      rel="noopener noreferrer"
-      >Packages
-    </a>
-  </div>
-  <div
-    class="links-right flex flex-row gap-8 justify-center align-middle items-center font-semibold"
-  >
-    <ThemeSwitch client:load />
-    <a
-      href="https://discord.gg/5fdPuxTg5Q"
-      class="fab fa-discord text-2xl hover:text-blue-600 dark:hover:text-blue-500"
-      aria-label="Ultramarine Discord link"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <span class="hidden">Ultramarine Discord server</span>
-    </a>
-    <a
-      href="https://twitter.com/UltramarineProj"
-      class="fab fa-twitter text-2xl hover:text-blue-600 dark:hover:text-blue-500"
-      aria-label="Ultramarine Linux Twitter link"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <span class="hidden">Ultramarine Linux Twitter</span>
-    </a>
-    <a
-      href="https://fedi.fyralabs.com/@ultramarine"
-      class="fab fa-mastodon text-2xl hover:text-blue-600 dark:hover:text-blue-500"
-      aria-label="Ultramarine Linux Mastodon link"
-      target="_blank"
-      rel="noopener noreferrer me"
-    >
-      <span class="hidden">Ultramarine Linux Mastodon</span>
-    </a>
-    <a
-      href="https://github.com/ultramarine-linux"
-      class="fab fa-github text-2xl hover:text-blue-600 dark:hover:text-blue-500"
-      aria-label="Ultramarine Linux Github link"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <span class="hidden">Ultramarine Linux Github</span>
-    </a>
-    <a
-      href="/download"
-      class="md:block hidden bg-blue-600 hover:bg-blue-700 text-gray-50 px-6 py-2 rounded-[24px]"
-      >Download</a
-    >
-  </div>
+        <ThemeSwitch client:load />
+        <a
+            href="https://fyralabs.com/discord"
+            class="fab fa-discord text-2xl hover:text-blue-600 dark:hover:text-blue-500"
+            aria-label="Ultramarine Discord link"
+            target="_blank"
+            rel="noopener noreferrer"
+        >
+            <span class="hidden">Ultramarine Discord server</span>
+        </a>
+        <a
+            href="https://fyralabs.com/matrix"
+            class="w-6 hover:text-blue-600 dark:hover:text-blue-500"
+            aria-label="Ultramarine Matrix link"
+            target="_blank"
+            rel="noopener noreferrer"
+        >
+            <svg
+                role="img"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+                fill="currentColor"
+                ><title>Matrix</title><path
+                    d="M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z"
+                ></path></svg
+            >
+            <span class="hidden">Ultramarine Matrix space</span>
+        </a>
+        <a
+            href="https://twitter.com/UltramarineProj"
+            class="fab fa-twitter text-2xl hover:text-blue-600 dark:hover:text-blue-500"
+            aria-label="Ultramarine Linux Twitter link"
+            target="_blank"
+            rel="noopener noreferrer"
+        >
+            <span class="hidden">Ultramarine Linux Twitter</span>
+        </a>
+        <a
+            href="https://fedi.fyralabs.com/@ultramarine"
+            class="fab fa-mastodon text-2xl hover:text-blue-600 dark:hover:text-blue-500"
+            aria-label="Ultramarine Linux Mastodon link"
+            target="_blank"
+            rel="noopener noreferrer me"
+        >
+            <span class="hidden">Ultramarine Linux Mastodon</span>
+        </a>
+        <a
+            href="https://github.com/ultramarine-linux"
+            class="fab fa-github text-2xl hover:text-blue-600 dark:hover:text-blue-500"
+            aria-label="Ultramarine Linux Github link"
+            target="_blank"
+            rel="noopener noreferrer"
+        >
+            <span class="hidden">Ultramarine Linux Github</span>
+        </a>
+        <a
+            href="/download"
+            class="md:block hidden bg-blue-600 hover:bg-blue-700 text-gray-50 px-6 py-2 rounded-[24px]"
+            >Download</a
+        >
+    </div>
 </header>
diff --git a/src/env.d.ts b/src/env.d.ts
@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		/// <reference path="../.astro/types.d.ts" />
		/// <reference types="astro/client" />