Resolve merge conflicts.

Author: myShoggoth

docs/affiliates/about/index.html

@@ -429,6 +429,7 @@ <h2>Affiliated Projects</h2>
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -442,7 +443,7 @@ <h2>Affiliated Projects</h2>
           <a href="../../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -453,7 +454,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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/affiliates/index.html

@@ -394,6 +394,7 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -407,7 +408,7 @@ <h2 class="text-2xl font-normal">Join Affiliations!</h2>
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -418,7 +419,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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/board-nominations/index.html

@@ -402,6 +402,7 @@ <h3>Criteria</h3>
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -415,7 +416,7 @@ <h3>Criteria</h3>
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -426,7 +427,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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/contact/index.html

@@ -349,6 +349,7 @@ <h3 class="font-semibold text-xl">HF Slack</h3>
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -362,7 +363,7 @@ <h3 class="font-semibold text-xl">HF Slack</h3>
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -373,7 +374,7 @@ <h3 class="font-semibold text-xl">HF Slack</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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/css/main.css

@@ -302,7 +302,7 @@ <h2 class="pt-12 text-2xl-4xl text-center font-semibold">Sponsorship Levels</h2>
               </div>
               <div class="space-y-1">
                 <h3 class="text-3xl font-normal">Functor</h3>
-                <div class="text-gray-600 text-xl font-medium">10k / year</div>
+                <div class="text-gray-600 text-xl font-medium">USD $10k+ / year</div>
               </div>
               <p class>
                 Receive ongoing acknowledgements on social media channels and have a small logo displayed on the HF website.
@@ -319,7 +319,7 @@ <h3 class="text-3xl font-normal">Functor</h3>
               </div>
               <div class="space-y-1">
                 <h3 class="text-3xl font-normal">Applicative</h3>
-                <div class="text-gray-600 text-xl font-medium">25k / year</div>
+                <div class="text-gray-600 text-xl font-medium">USD $25k+ / year</div>
               </div>
               <p class>
                 Have your logo and story featured in the Supporter Spotlight on the website and newsletter, a medium- sized logo displayed on the HF website, and receive ongoing recognition on our social media pages.
@@ -338,7 +338,7 @@ <h3 class="text-3xl font-normal">Applicative</h3>
               </div>
               <div class="space-y-1">
                 <h3 class="text-3xl font-normal">Monad</h3>
-                <div class="text-gray-600 text-xl font-medium">70k / year</div>
+                <div class="text-gray-600 text-xl font-medium">USD $70k+ / year</div>
               </div>
               <p class>
                 All of the benefits of Functor and Applicative memberships, with the addition of a full interview for the Haskell Foundation blog, as well as having your logo prominently displayed on the HF website.
@@ -409,6 +409,7 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -422,7 +423,7 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -433,7 +434,7 @@ <h2 class="text-gray-50 font-normal text-3xl-4xl text-center">In-Kind Support</h
     <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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/donations/index.html

@@ -310,6 +310,7 @@ <h2 class="font-normal text-xl-2xl">What Is The Relationship Between HF And The
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -323,7 +324,7 @@ <h2 class="font-normal text-xl-2xl">What Is The Relationship Between HF And The
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -334,7 +335,7 @@ <h2 class="font-normal text-xl-2xl">What Is The Relationship Between HF And The
     <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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/faq/index.html

@@ -319,6 +319,7 @@ <h2>Acknowledgements</h2>
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -332,7 +333,7 @@ <h2>Acknowledgements</h2>
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -343,7 +344,7 @@ <h2>Acknowledgements</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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/guidelines-for-respectful-communication/index.html

@@ -189,7 +189,7 @@
       <div class="border border-purple-300 p-1 lg:p-3">
         <div class="border border-purple-200 p-1 lg:p-3">
           <div class="border border-purple-100 p-1 lg:p-3">
-            <div class="border border-purple-50 p-16 sm:py-24 md:py-32 flex flex-col items-center text-center">
+            <div class="border border-purple-50 p-16 flex flex-col items-center text-center">
               <h1 class="mb-4 text-3xl-6xl font-w-800">The Haskell Foundation</h1>
               <div class="text-gray-500">An independent, non-profit organization dedicated to broadening the adoption of Haskell, by supporting its ecosystem of tools, libraries, education, and research.</div>
             </div>
@@ -407,6 +407,7 @@ <h3 class="font-semibold text-xl"><a href="https://groups.google.com/u/2/a/haske
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="./static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="./static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="./static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -420,7 +421,7 @@ <h3 class="font-semibold text-xl"><a href="https://groups.google.com/u/2/a/haske
           <a href="./contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -431,7 +432,7 @@ <h3 class="font-semibold text-xl"><a href="https://groups.google.com/u/2/a/haske
     <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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">

docs/index.html

@@ -495,6 +495,7 @@ <h2 class="text-2xl-4xl font-normal">Haskell Foundation Board Of Directors Call
     <a href="https://mercury.com/" target="_blank" class="block w-36 m-4"><img alt="Mercury Bank" src="../static/images/sponsors/mercury/mercury.png" srcset="
       /static/images/sponsors/mercury/mercury.png"></a>
     <a href="https://tripshot.com/" target="_blank" class="block w-36 m-4"><img alt="TripShot" src="../static/images/sponsors/tripshot/Tripshot_Logo_RGB.png"></a>
+    <a href="https://herp.co.jp/" target="_blank" class="black w-36 m-4"><img alt="HERP" src="../static/images/sponsors/herp/black.png"></a>
   </div>
 </div>
 
@@ -508,7 +509,7 @@ <h2 class="text-2xl-4xl font-normal">Haskell Foundation Board Of Directors Call
           <a href="../contact" class="arrow-link light">>> contact us</a>
         </div>
       </div>
-
+ 
       <div class="flex space-x-4 w-44">
         <a href="https://twitter.com/haskellfound" target="_blank" class="text-4xl block"><span class="fab fa-twitter"></span></a>
         <a href="https://www.linkedin.com/company/haskell-foundation-inc" target="_blank" class="text-4xl block"><span class="fab fa-linkedin-in"></span></a>
@@ -519,7 +520,7 @@ <h2 class="text-2xl-4xl font-normal">Haskell Foundation Board Of Directors Call
     <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/logos/hf-logo-100-alpha.png" class="h-8" />
-        <div class="font-medium">2021 © Haskell Foundation</div>
+        <div class="font-medium">2021 © Haskell Foundation, <a href="https://github.com/haskellfoundation/haskellfoundation.github.io">submit website bug reports and fixes on GitHub</a></div>
       </div>
 
       <div class="text-sm mt-6 flex ml-8 flex-col justify-items-start text-left">