fix conflict

content/newsroom/2020/11/post-08/index.md

@@ -8,7 +8,8 @@ description: As mentioned as a preview in our October update, 3Bot Connect is no
 extra:
     imgPath: images/newsroom/tfconnectupdate.png
     image_caption: 3bot connect renamed
-    author: Sam Taggart
+    authors: [sam_taggart]
+    authorImg: ''
     
 ---
 

content/newsroom/2021/01/post-12/index.md

@@ -10,6 +10,7 @@ extra:
     imgPath: images/newsroom/2020rewindgrid24.png
     image_caption: A 2020 Rewind & Grid 2.4 News!
     authors: [sam_taggart]
+    authorImg: ''
 ---
 
 Hi all, we hope your 2021 has been off to a fabulous start!

content/newsroom/2021/06/post-08/index.md

@@ -8,7 +8,8 @@ description: We have received a huge influx in pre-registrations for the Titan V
 extra:
     imgPath: images/newsroom/3k3nodes.png
     image_caption: 3,000 3Node Pre-Registrations
-    author: Sam Taggart
+    authors: [sam_taggart]
+    authorImg: ''
 ---
 
 Over the past days we have received **more than 3,000 pre-registrations** for the Titan V2 3Node!

content/newsroom/2022/02/post-06/index.md

@@ -8,8 +8,8 @@ description: Your weekly ThreeFold digest!
 extra:
     imgPath: images/newsroom/tfweekly8.png
     image_caption: TF Weekly Volume Eight
-    author: Sam Taggart
-    
+    authors: [sam_taggart]
+    authorImg: ''
 ---
 
 📰 **ThreeFold Weekly! February 28th Edition (Volume Eight)**

content/newsroom/2022/02/post-07/index.md

@@ -8,7 +8,8 @@ description: It's time to get the ThreeFold Validators verified!
 extra:
     imgPath: images/newsroom/validator_verification_process.png
     image_caption: Validator Verification Process
-    author: Sam Taggart
+    authors: [sam_taggart]
+    authorImg: ''
 ---
 
 🚨 **The ThreeFold Validator Verification Process**

content/newsroom/2022/03/post-01/index.md

@@ -8,9 +8,9 @@ description: ThreeFold and Paradise Hills join forces to bring the world’s lar
 extra:
     imgPath: images/newsroom/paradise_hills.png
     image_caption: ODE and ThreeFold
-    author: Sam Taggart
-
-    
+    authors: [sam_taggart]
+    isFeatured: "true"
+    authorImg: ''
 ---
 
 DUBAI, United Arab Emirates | Real Estate developer Paradise Hills and ThreeFold have announced today their plans to add dedicated servers (3Nodes) to approximately 170 homes in the Paradise Hill project, creating the world’s first neighborhood Cloud Network on the ThreeFold Grid.

content/newsroom/2022/04/post-05/index.md

@@ -8,8 +8,8 @@ description: Weekly highlights from the ThreeFold universe!
 extra:
     imgPath: images/newsroom/tfweekly14.png
     image_caption: TF Weekly Volume Fourteen
-    author: Sam Taggart
-    isFeatured: "true"
+    authors: [sam_taggart]
+    authorImg: ''
 ---
 
 

templates/partials/featuredNews.html

@@ -12,7 +12,7 @@
 
       <h4 class="text-sm not-italic font-light leading-6 text-gray-600">
         {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} -
-        {{ featured.extra.author }}
+        {{ featured.extra.authors }}
       </h4>
 
     </div>

templates/partials/newsCard.html

@@ -15,6 +15,33 @@
         </p>
         {% endif %}
     </a>
+    <div class="flex items-center">
+      <div class="flex justify-between items-center">
+        <ul class="list-none flex author-list my-10 mr-2 px-0">
+          {% for author in post.extra.authors %}
+          {% set fullpath = "/people/" ~ author | replace(from='_', to='-' ) %}
+
+          <li class="author-list-item">
+            <a href="{{fullpath}}" tooltip="{{author}}">
+              <img src="{{ post.extra.authorImg }}" alt="{{ author }}" class="
+                  w-8
+                  h-8
+                  rounded-full
+                  bg-gray-200
+                  border-2 border-white
+                " />
+            </a>
+          </li>
+          {% endfor %}
+        </ul>
+      </div>
+
+      <p class="text-gray-700 text-xs">
+        <time datetime="{{post.date}}">
+          {{ post.date | date(format="%B %e, %Y", timezone="America/Chicago") }}
+        </time>
+      </p>
+    </div>
   </div>
 </div>
 </div>