Merge remote-tracking branch 'eval/main' into 12.rework-contribute

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>

src/_sass/_custom.scss

@@ -96,6 +96,13 @@
   margin-bottom: auto;
 }
 
+#contribute .feature__item {
+  @media (min-width: 37.5em) {
+    width: 45%;
+    margin-inline-start: 3.3%;
+  }
+}
+
 #blog {
   margin-top: 2em;
   background-color: #eee;

src/assets/images/collaborations.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #0075a2;
+      }
+
+      .cls-1, .cls-2, .cls-3 {
+        fill-rule: evenodd;
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: #101820;
+      }
+
+      .cls-3 {
+        fill: #f7b538;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M11.131,26.076l-5.524-1.035c-.595-.11-1.173.253-1.293.812L.021,46.11c-.117.559.269,1.103.863,1.215l5.524,1.035c.595.11,1.173-.253,1.293-.812l4.293-20.257c.117-.559-.269-1.103-.864-1.216h0Z"/>
+  <path class="cls-3" d="M19.972,33.664l2.115,9.11c4.222-1.439,4.192-4.827,4.575-8.452.117-1.046.902-1.722,2.024-1.799,1.88-.129,5.025,1.789,6.225,3.046l13.542,12.916,1.608-1.512-3.724-17.572c-1.354.253-2.74.309-4.112.168-2.629-.279-5.464-1.347-8.541-3.733-1.528-1.185-3.576-1.377-5.127-.159l-7.757,6.089c-.626.491-1.006,1.137-.83,1.898h0Z"/>
+  <path class="cls-1" d="M13.964,27.966h8.452l-2.943,2.31c-1.204.945-1.869,2.322-1.526,3.8l2.353,10.137c.121.526.673.859,1.232.745.031-.006.062-.014.092-.023,6.255-1.476,6.621-5.382,7.019-9.631.09-.96.016-1.091,1.302-.609.951.357,2.153,1.091,3.493,2.238l14.156,13.501c.519,1.073.013,2.339-1.129,2.826-.861.368-1.875.195-2.544-.434l-9.843-9.252c-.404-.381-1.061-.381-1.465,0s-.405.997,0,1.378l9.843,9.254c.886.833.886,2.184,0,3.017s-2.324.833-3.21,0l-10.401-9.777c-.392-.392-1.047-.412-1.464-.044-.417.368-.438.984-.047,1.377.015.015.031.03.047.044l7.851,7.38c.886.833.886,2.184,0,3.018s-2.324.833-3.21,0l-8.409-7.904c-.411-.375-1.066-.366-1.465.02-.39.378-.39.979,0,1.357l3.908,3.674c.881.838.873,2.189-.019,3.018-.884.822-2.307.822-3.191,0l-12.96-12.183,4.076-19.235h0Z"/>
+  <path class="cls-2" d="M11.213,13.23l-1.987-1.868c-.63-.592-.63-1.593,0-2.186l4.084-3.839c.577-.543,1.477-.543,2.055,0l2.122,1.995c2.447-1.536,5.191-2.605,8.076-3.146V1.5c0-.828.672-1.5,1.5-1.5h5.873c.828,0,1.5.672,1.5,1.5v2.685c2.885.541,5.629,1.61,8.076,3.147l2.122-1.995c.577-.543,1.477-.543,2.055,0l4.084,3.839c.63.592.63,1.593,0,2.186l-1.987,1.868c1.634,2.3,2.772,4.879,3.347,7.592h2.452c1.105,0,2,.895,2,2v.907c-.73-.55-1.681-.768-2.598-.597l-5.524,1.035c-1.642.311-2.746,1.767-2.523,3.328-.796.145-1.606.214-2.417.206,1.59-7.021-3.175-13.924-10.643-15.419-7.468-1.495-14.812,2.984-16.402,10.005-.201.889-.303,1.796-.303,2.705,0,.345.014.687.042,1.026h-2.344c-.391-.953-1.273-1.651-2.338-1.852l-5.524-1.035c-.917-.171-1.868.047-2.598.597v-.906c0-1.105.895-2,2-2h2.452c.576-2.712,1.713-5.292,3.347-7.592h0Z"/>
+  <path class="cls-3" d="M48.869,26.076l5.524-1.035c.595-.11,1.173.253,1.293.812l4.293,20.257c.117.559-.269,1.103-.864,1.215l-5.524,1.035c-.595.11-1.173-.253-1.293-.812l-4.294-20.257c-.117-.56.269-1.103.864-1.216h0Z"/>
+</svg>

src/index.html

@@ -14,7 +14,7 @@ excerpt: >-
   Even if some of the servers fail or are taken over by an attacker,
   the entire file store continues to function correctly, preserving your privacy and security.
 documentation:
-  - title: "Documentation"
+  - title: "Official Documentation"
 documentation_list:
   - image_path: /assets/images/overview.svg
     alt: "overview"
@@ -40,8 +40,11 @@ documentation_list:
       <p><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></p>
       </center>
 contribute:
-  - title: "Contribute"
+  - title: "Get Involved"
-    excerpt: ""
+    excerpt: '
+      Interested in learning more or wanting to contribute to Tahoe-LAFS?<br/>
+      There are various ways to get involved!
+    '
 contribute_list:
   - image_path: /assets/images/discussions.svg
     alt: "discussions"
@@ -51,12 +54,20 @@ contribute_list:
       <li>Join the <a href="https://libera.chat/" target="_blank"><b>#tahoe-lafs</b></a> channel on Libera</li>
       <li>Meet us on <a href="https://meet.jit.si/AccurateFiltersManipulateBefore" target="blank"><b>Tuesday</b></a> at 17:00 UTC on Jitsi </li>
     </ul>'
+  - image_path: /assets/images/collaborations.svg
+    alt: "collaborations"
+    title: "Collaborations"
+    excerpt: >-
+      <ul>
+      <li><a href="https://leastauthority.com/" target="_blank">Least Authority</a> uses and contributes to Tahoe-LAFS</li>
+      <li>Google, Inc. sponsored Tahoe-LAFS through its Summer of Code program in 2010 and 2013</li>
+      </ul>
   - image_path: /assets/images/issues.svg
     alt: "issues"
     title: "Issues"
     excerpt: '<ul>
-      <li>Visit the <a href="https://code.lafs.eval.latfa.net/tahoe-lafs/trac/issues"><b>issue</b></a> tracker</li>
+      <li>Visit the <a href="https://forge.lafs.eval.latfa.net/tahoe-lafs/trac"><b>issue</b></a> tracker</li>
-      <li>Register an <a href="https://code.lafs.eval.latfa.net/user/sign_up"><b>account</b></a> to interact</li>
+      <li>Register an <a href="https://forge.lafs.eval.latfa.net/user/sign_up"><b>account</b></a> to interact</li>
     </ul>'
   - image_path: /assets/images/code.svg
     alt: "code"
@@ -79,6 +90,7 @@ about:
       Check out some of the main contributors to this project!
     url: "https://tahoe-lafs.org/trac/tahoe-lafs/wiki/AboutUs"
     btn_label: "Our Contributors"
+    btn_class: "btn--primary"
 ---
 <div id="documentation">
 {% include feature_row id="documentation" type="center" %}
@@ -90,6 +102,7 @@ about:
 {% include feature_row id="contribute_list" %}
 </div>
 
+<br/>
 <div id="blog">
 {% include feature_row id="blog" type="center" %}
 <div class="entries-grid">