Merge pull request #98 from jhrcek/site-fixes

Properly unify nav and mobile nav structure, fix markup issues

Author: myShoggoth

docs/affiliates/about/index.html

@@ -50,30 +50,27 @@
   <div class="mt-6">
     <a href="../../" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Home</a>
 
-
-
-    <div href="../../who-we-are" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
       <a href="../../who-we-are" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Current Board</a>
       <a href="../../who-we-are/past-boards" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Past Boards</a>
-      <a href="../../contact" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
-      <a href="../../vision" class="block py-3 border-t border-gray-320 text-lg font-medium">Vision</a>
+      <a href="../../contact" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
+      <a href="../../vision" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Vision</a>
 
     <a href="../../podcast" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Podcast</a>
 
     <a href="../../projects" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Projects</a>
 
     <a href="../../donations" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Sponsorship</a>
 
-    <div href="../../affiliates" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
       <a href="../../affiliates" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Affiliates</a>
       <a href="../../affiliates/about" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">About Affiliating</a>
 
-    <div href="../../news" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
+    <div class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
       <a href="../../news" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">News</a>
       <a href="../../news/press" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Press</a>
-      <a href="../../resources" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
-      <a href="../../faq" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
-
+      <a href="../../resources" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
+      <a href="../../faq" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
 
   </div>
 
@@ -109,25 +106,25 @@
                   Past Boards
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../contact" id>Contact</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../contact">Contact</a>
 
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../vision" id>Vision</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../vision">Vision</a>
             </div>
 
         </li>
 
 	<li class="relative">
-	  <a href="../../podcast" id"">Podcast</a>
+	  <a href="../../podcast">Podcast</a>
 	</li>
 
         <li class="relative">
-          <a href="../../projects" id>Projects</a>
+          <a href="../../projects">Projects</a>
 
         </li>
 
         <li class="relative">
-          <a href="../../donations" id>Sponsorship</a>
+          <a href="../../donations">Sponsorship</a>
 
         </li>
 
@@ -161,9 +158,9 @@
                   Press
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../resources" id>Resources</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../resources">Resources</a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../faq" id>FAQ</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../../faq">FAQ</a>
             </div>
 
         </li>
@@ -433,7 +430,7 @@ <h2>Affiliated Projects</h2>
       <div class="lg:flex space-y-4 lg:gap-2 lg:flex-grow lg:space-y-0">
         <div class="font-medium mt-1">To learn more about the Haskell Foundation </div>
         <div class="ml-2">
-          <a href="./contact" class="arrow-link light">>> contact us</a>
+          <a href="../../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
 
@@ -446,7 +443,7 @@ <h2>Affiliated Projects</h2>
 
     <div class="flex flex-row">
       <div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
-        <img src="./static/images/haskell-foundation-logo-gray.svg" class="h-8" />
+        <img src="../../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
         <div class="font-medium">2021 © Haskell Foundation</div>
       </div>
 

docs/affiliates/index.html

@@ -50,30 +50,27 @@
   <div class="mt-6">
     <a href="../" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Home</a>
 
-
-
-    <div href="../who-we-are" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
       <a href="../who-we-are" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Current Board</a>
       <a href="../who-we-are/past-boards" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Past Boards</a>
-      <a href="../contact" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
-      <a href="../vision" class="block py-3 border-t border-gray-320 text-lg font-medium">Vision</a>
+      <a href="../contact" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
+      <a href="../vision" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Vision</a>
 
     <a href="../podcast" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Podcast</a>
 
     <a href="../projects" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Projects</a>
 
     <a href="../donations" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Sponsorship</a>
 
-    <div href="../affiliates" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
       <a href="../affiliates" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Affiliates</a>
       <a href="../affiliates/about" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">About Affiliating</a>
 
-    <div href="../news" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
+    <div class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
       <a href="../news" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">News</a>
       <a href="../news/press" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Press</a>
-      <a href="../resources" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
-      <a href="../faq" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
-
+      <a href="../resources" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
+      <a href="../faq" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
 
   </div>
 
@@ -109,25 +106,25 @@
                   Past Boards
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../contact" id>Contact</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../contact">Contact</a>
 
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../vision" id>Vision</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../vision">Vision</a>
             </div>
 
         </li>
 
 	<li class="relative">
-	  <a href="../podcast" id"">Podcast</a>
+	  <a href="../podcast">Podcast</a>
 	</li>
 
         <li class="relative">
-          <a href="../projects" id>Projects</a>
+          <a href="../projects">Projects</a>
 
         </li>
 
         <li class="relative">
-          <a href="../donations" id>Sponsorship</a>
+          <a href="../donations">Sponsorship</a>
 
         </li>
 
@@ -161,9 +158,9 @@
                   Press
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../resources" id>Resources</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../resources">Resources</a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../faq" id>FAQ</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../faq">FAQ</a>
             </div>
 
         </li>
@@ -398,7 +395,7 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
       <div class="lg:flex space-y-4 lg:gap-2 lg:flex-grow lg:space-y-0">
         <div class="font-medium mt-1">To learn more about the Haskell Foundation </div>
         <div class="ml-2">
-          <a href="./contact" class="arrow-link light">>> contact us</a>
+          <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
 
@@ -411,7 +408,7 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
 
     <div class="flex flex-row">
       <div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
-        <img src="./static/images/haskell-foundation-logo-gray.svg" class="h-8" />
+        <img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
         <div class="font-medium">2021 © Haskell Foundation</div>
       </div>
 

docs/board-nominations/index.html

@@ -50,30 +50,27 @@
   <div class="mt-6">
     <a href="../" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Home</a>
 
-
-
-    <div href="../who-we-are" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">About</div>
       <a href="../who-we-are" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Current Board</a>
       <a href="../who-we-are/past-boards" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Past Boards</a>
-      <a href="../contact" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
-      <a href="../vision" class="block py-3 border-t border-gray-320 text-lg font-medium">Vision</a>
+      <a href="../contact" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Contact</a>
+      <a href="../vision" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Vision</a>
 
     <a href="../podcast" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Podcast</a>
 
     <a href="../projects" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Projects</a>
 
     <a href="../donations" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Sponsorship</a>
 
-    <div href="../affiliates" class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
+    <div class="block py-3 border-t border-gray-320 text-lg font-medium text-gray-500">Affiliates</div>
       <a href="../affiliates" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Affiliates</a>
       <a href="../affiliates/about" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">About Affiliating</a>
 
-    <div href="../news" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
+    <div class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium text-gray-500">News and Info</div>
       <a href="../news" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">News</a>
       <a href="../news/press" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Press</a>
-      <a href="../resources" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
-      <a href="../faq" class="block py-3 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
-
+      <a href="../resources" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">Resources</a>
+      <a href="../faq" class="block py-3 pl-6 border-t border-gray-320 hover:bg-gray-100 text-lg font-medium">FAQ</a>
 
   </div>
 
@@ -109,25 +106,25 @@
                   Past Boards
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../contact" id>Contact</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../contact">Contact</a>
 
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../vision" id>Vision</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../vision">Vision</a>
             </div>
 
         </li>
 
 	<li class="relative">
-	  <a href="../podcast" id"">Podcast</a>
+	  <a href="../podcast">Podcast</a>
 	</li>
 
         <li class="relative">
-          <a href="../projects" id>Projects</a>
+          <a href="../projects">Projects</a>
 
         </li>
 
         <li class="relative">
-          <a href="../donations" id>Sponsorship</a>
+          <a href="../donations">Sponsorship</a>
 
         </li>
 
@@ -161,9 +158,9 @@
                   Press
                 </a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../resources" id>Resources</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../resources">Resources</a>
 
-          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../faq" id>FAQ</a>
+          	<a class="block p-4 border-t-2 hover:bg-gray-50 cursor-pointer" href="../faq">FAQ</a>
             </div>
 
         </li>
@@ -405,7 +402,7 @@ <h3>Criteria</h3>
       <div class="lg:flex space-y-4 lg:gap-2 lg:flex-grow lg:space-y-0">
         <div class="font-medium mt-1">To learn more about the Haskell Foundation </div>
         <div class="ml-2">
-          <a href="./contact" class="arrow-link light">>> contact us</a>
+          <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
 
@@ -418,7 +415,7 @@ <h3>Criteria</h3>
 
     <div class="flex flex-row">
       <div class="mt-16 flex flex-col text-center flex-grow lg:flex-row lg:space-x-8 lg:space-y-0">
-        <img src="./static/images/haskell-foundation-logo-gray.svg" class="h-8" />
+        <img src="../static/images/haskell-foundation-logo-gray.svg" class="h-8" />
         <div class="font-medium">2021 © Haskell Foundation</div>
       </div>