Clean up nav bar styling for projects

- Move the title above nav bar - Mirror styling for nav bar on main website
UCSD-E4E · Apr 3, 2024 · 85779f2 · 85779f2
1 parent 87eb953
commit 85779f2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 26 deletions.
diff --git a/_layouts/gallery.html b/_layouts/gallery.html
@@ -4,9 +4,18 @@
 ---
 
 <div class="feed">
+  {%- if page.title -%}
+    <h1 class="page-heading">{{ page.title }} Media</h1>
+  {%- endif -%}
+
   {%- if page.enable_nav -%}
     <nav id="project-navigation">
       <ul id="menu-project-nav" class="menu-project">
+        <li id="" class="menu-projects">
+            <a href={{ "./" }}>
+            {{ page.title }}
+            </a>
+        </li>
         <li id="" class="menu-projects">
         <a href={{ "./update"  }}>
             Project Updates
@@ -17,19 +26,11 @@
             Media
             </a>
         </li>
-        <li id="" class="menu-projects">
-            <a href={{ "./" }}>
-            {{ page.title }}
-            </a>
-        </li>
+
       </ul>
     </nav>
   {%- endif -%}
 
-
-  {%- if page.title -%}
-    <h1 class="page-heading">{{ page.title }} Media</h1>
-  {%- endif -%}
 
   {% include gallery_component.html media=page.media grid=page.grid %}
 </div>

diff --git a/_layouts/post_feed.html b/_layouts/post_feed.html
@@ -3,9 +3,18 @@
 ---
 
 <div class="feed">
+  {%- if page.title -%}
+  <h1 class="page-heading">{{ page.title }} Posts</h1>
+{%- endif -%}
+
   {%- if page.enable_nav -%}
     <nav id="project-navigation">
       <ul id="menu-project-nav" class="menu-project">
+        <li id="" class="menu-projects">
+          <a href={{ "./" }}>
+            {{ page.title }}
+          </a>
+        </li>
         <li id="" class="menu-projects">
           <a aria-current="page">
             Project Updates
@@ -16,19 +25,13 @@
             Media
           </a>
         </li>
-        <li id="" class="menu-projects">
-          <a href={{ "./" }}>
-            {{ page.title }}
-          </a>
-        </li>
+
       </ul>
     </nav>
   {%- endif -%}
 
 
-  {%- if page.title -%}
-    <h1 class="page-heading">{{ page.title }} Posts</h1>
-  {%- endif -%}
+
   {%- if site.posts.size > 0 -%}
     <ul class="post-list">
       {%- for post in site.posts -%}

diff --git a/_layouts/project.html b/_layouts/project.html
@@ -4,9 +4,16 @@
 
 <!-- TODO what is itemtype + itemscope-->
 <article class="project h-entry" itemscope itemtype="http://schema.org/BlogPosting">
+  <h1 class="page-heading">{{ page.title }}</h1>
+
   {%- if page.enable_nav -%}
   <nav id="project-navigation">
     <ul id="menu-project-nav" class="menu-project">
+      <li id="" class="menu-projects">
+        <a href={{ page.permalink }} aria-current="page">
+          {{ page.title }}
+        </a>
+      </li>
       <li id="" class="menu-projects">
         <a href={{ page.permalink | append: "/update"  }}>
           Project Updates
@@ -17,17 +24,10 @@
           Media
         </a>
       </li>
-      <li id="" class="menu-projects">
-        <a href={{ page.permalink }} aria-current="page">
-          {{ page.title }}
-        </a>
-      </li>
     </ul>
   </nav>
   {%- endif -%}
-  <header class="project-header">
-    <h1 class="project-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>
-  </header>
+
 
   <div class="project-content e-content" itemprop="articleBody">
     {{ content }}

diff --git a/_sass/minima.scss b/_sass/minima.scss
@@ -47,5 +47,6 @@ $on-laptop:        800px !default;
 @import
   "minima/base",
   "minima/layout",
-  "minima/syntax-highlighting"
+  "minima/syntax-highlighting",
+  "minima/project_nav.scss"
 ;
diff --git a/_sass/minima/_project_nav.scss b/_sass/minima/_project_nav.scss
@@ -0,0 +1,11 @@
+.menu-project {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    justify-content: space-evenly;
+    align-items: center;
+}
+
+.menu-projects {
+    list-style-type: none;
+}