Skip to content

Commit a925904

Browse files
committed
Resolved merge conflicts
1 parent ab382c7 commit a925904

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

frontend/about.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,23 +229,23 @@ title: About Us
229229
<h3 class="text-xl font-semibold mb-4">
230230
<span aria-hidden="true">🇦🇺</span> Brisbane Moderators
231231
</h3>
232-
<div class="flex flex-wrap justify-center gap-6">
232+
<div class="grid grid-cols-1 gap-6 justify-items-center">
233233
<a href="https://github.com/therealnugget" class="flex flex-col items-center text-center team-role team-role-coordinator text-team-role-coordinator">
234234
<img class="w-32 md:w-48 lg:w-[300px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/therealnugget.jpeg' | url }}" alt="therealnugget avatar" />
235235
<span class="font-medium">Thomas</span>
236236
<span class="github">@therealnugget</span>
237237
</a>
238-
</div>
239-
{% set moderators = [
240-
{ name: "Eddie" },
241-
{ name: "Jasper" }
242-
] %}
243-
<div class="flex flex-wrap justify-center gap-6">
244-
{% for moderator in moderators -%}
245-
<div class="flex flex-col items-center text-center w-1/2 sm:w-1/3 team-role team-role-leader text-team-role-leader">
246-
<img class="w-32 md:w-40 lg:w-[225px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="{{ moderator.name }} avatar" />
247-
<span class="font-medium">{{ moderator.name }}</span>
248-
<span class="github">N/A</span>
238+
<div class="flex flex-wrap justify-center gap-6">
239+
<div class="flex flex-col items-center text-center team-role team-role-leader text-team-role-leader">
240+
<img class="w-32 md:w-40 lg:w-[225px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Eddie avatar" />
241+
<span class="font-medium">Eddie</span>
242+
<span class="github">N/A</span>
243+
</div>
244+
<div class="flex flex-col items-center text-center team-role team-role-leader text-team-role-leader">
245+
<img class="w-32 md:w-40 lg:w-[225px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Jasper avatar" />
246+
<span class="font-medium">Jasper</span>
247+
<span class="github">N/A</span>
248+
</div>
249249
</div>
250250
{%- endfor %}
251251
</div>

0 commit comments

Comments
 (0)