Disowned navbar

Team-Immersive-Intelligence · Sep 4, 2024 · 9321b61 · 9321b61
1 parent f185345
commit 9321b61
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 51 deletions.
diff --git a/website/_includes/header.html b/website/_includes/header.html
@@ -1,31 +1,32 @@
-<header class="site-header" role="banner">
-  <div class="wrapper navbar">
-    {%- assign default_paths = site.pages | map: "path" -%}
-    {%- assign page_paths = site.header_pages | default: default_paths -%}
-    <a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
+<div class="wrapper navbar">
+  {%- assign default_paths = site.pages | map: "path" -%}
+  {%- assign page_paths = site.header_pages | default: default_paths -%}
+  <a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
 
-    {%- if page_paths -%}
-      <nav class="site-nav">
-        <input type="checkbox" id="nav-trigger" class="nav-trigger" />
-        <label for="nav-trigger">
+  {%- if page_paths -%}
+  <nav class="site-nav">
+    <input type="checkbox" id="nav-trigger" class="nav-trigger" />
+    <label for="nav-trigger">
           <span class="menu-icon">
             <svg viewBox="0 0 18 15" width="18px" height="15px">
               <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
             </svg>
           </span>
-        </label>
+    </label>
+
+    <div class="trigger">
+      {%- for path in page_paths -%}
+      {%- assign my_page = site.pages | where: "path", path | first -%}
+      {%- if my_page.title -%}
+      <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
+      {%- endif -%}
+      {%- endfor -%}
+      <a class="page-link" href="/#how-it-all-began">Members</a>
+      <a class="page-link" href="/#new-members">Hiring</a>
+    </div>
+  </nav>
+  {%- endif -%}
+</div>
+<header class="site-header" role="banner">
 
-        <div class="trigger">
-          {%- for path in page_paths -%}
-            {%- assign my_page = site.pages | where: "path", path | first -%}
-            {%- if my_page.title -%}
-            <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
-            {%- endif -%}
-          {%- endfor -%}
-          <a class="page-link" href="/#how-it-all-began">Members</a>
-          <a class="page-link" href="/#new-members">Hiring</a>
-        </div>
-      </nav>
-    {%- endif -%}
-  </div>
 </header>
diff --git a/website/_includes/header_parallax.html b/website/_includes/header_parallax.html
@@ -1,3 +1,30 @@
+<div class="wrapper navbar">
+    {%- assign default_paths = site.pages | map: "path" -%}
+    {%- assign page_paths = site.header_pages | default: default_paths -%}
+    {%- if page_paths -%}
+    <nav class="site-nav">
+        <input type="checkbox" id="nav-trigger" class="nav-trigger"/>
+        <label for="nav-trigger">
+          <span class="menu-icon">
+            <svg viewBox="0 0 18 15" width="18px" height="15px">
+              <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
+            </svg>
+          </span>
+        </label>
+
+        <div class="trigger">
+            {%- for path in page_paths -%}
+            {%- assign my_page = site.pages | where: "path", path | first -%}
+            {%- if my_page.title -%}
+            <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
+            {%- endif -%}
+            {%- endfor -%}
+            <a class="page-link" href="/#how-it-all-began">Members</a>
+            <a class="page-link" href="/#new-members">Hiring</a>
+        </div>
+    </nav>
+    {%- endif -%}
+</div>
 <header class="site-header-parallax" role="banner">
     <div id="scene" class="scene">
         <div class="layer-element-drone" data-depth="0.1"></div>
@@ -15,34 +42,6 @@
         var parallax = new Parallax(scene, {});
     </script>
 
-    <div class="wrapper navbar">
-        {%- assign default_paths = site.pages | map: "path" -%}
-        {%- assign page_paths = site.header_pages | default: default_paths -%}
-        {%- if page_paths -%}
-        <nav class="site-nav">
-            <input type="checkbox" id="nav-trigger" class="nav-trigger"/>
-            <label for="nav-trigger">
-          <span class="menu-icon">
-            <svg viewBox="0 0 18 15" width="18px" height="15px">
-              <path d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.032C17.335,0,18,0.665,18,1.484L18,1.484z M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.032C17.335,6.031,18,6.696,18,7.516L18,7.516z M18,13.516C18,14.335,17.335,15,16.516,15H1.484 C0.665,15,0,14.335,0,13.516l0,0c0-0.82,0.665-1.483,1.484-1.483h15.032C17.335,12.031,18,12.695,18,13.516L18,13.516z"/>
-            </svg>
-          </span>
-            </label>
-
-            <div class="trigger">
-                {%- for path in page_paths -%}
-                {%- assign my_page = site.pages | where: "path", path | first -%}
-                {%- if my_page.title -%}
-                <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
-                {%- endif -%}
-                {%- endfor -%}
-                <a class="page-link" href="/#how-it-all-began">Members</a>
-                <a class="page-link" href="/#new-members">Hiring</a>
-            </div>
-        </nav>
-        {%- endif -%}
-    </div>
-
     <div id="logo">
         <img src="../assets/header/hammer_logo.png"/>
         <p>

diff --git a/website/_sass/_general.scss b/website/_sass/_general.scss
@@ -176,6 +176,7 @@ pre {
 }
 
 .navbar {
+  z-index: 10000; /* Make it *always* visible ~Gabriel */
   position: sticky;
   top: 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,6 +176,7 @@ pre { @@
     }
     .navbar {
+      z-index: 10000; /* Make it *always* visible ~Gabriel */
       position: sticky;
       top: 0;
     }
@@ Expand Down @@