From edd40fc06b4567a2f03b6722df80af8cee8faef6 Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Mon, 5 Aug 2024 00:44:59 +0800
Subject: [PATCH] Refactor CSS classes for web graphics and adoptables

---
 src/_includes/main/virtualpets.njk |  2 +-
 src/assets/css/components.css      | 23 ++++++-----------------
 src/index.njk                      |  2 +-
 src/links/joined.njk               |  2 +-
 src/links/websites.njk             |  6 +++---
 src/pages/adoptables.njk           | 10 +++++-----
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/_includes/main/virtualpets.njk b/src/_includes/main/virtualpets.njk
index e5770c64..ecc67b79 100644
--- a/src/_includes/main/virtualpets.njk
+++ b/src/_includes/main/virtualpets.njk
@@ -1,7 +1,7 @@
 <section class="content__section">
     <h2>Virtual Pets</h2>
     <p>Feel free to check out my virtual pets and feed them!</p>
-    <ul class="adoptables">
+    <ul class="web-graphics adoptables">
         <li data-tooltip>
             <a href="https://tamanotchi.world/13150c" data-tooltip-trigger title="Tam, my tamaNOTchi"><img src="https://tamanotchi.world/i2/13150" alt="Tam, my tamaNOTchi" loading="lazy"></a>
         </li>
diff --git a/src/assets/css/components.css b/src/assets/css/components.css
index edf31046..4d7ea10d 100644
--- a/src/assets/css/components.css
+++ b/src/assets/css/components.css
@@ -143,23 +143,8 @@ a.link-btn[href^="http"]:not([href*="leilukin.com"]) { padding-right: calc(var(-
 
 .contnet-warning__content { padding: 1em; }
 
-/* Adoptables wrapper */
-.adoptables {
-    list-style-type: "";
-    margin: 0;
-    padding: 0;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: flex-end;
-    gap: 0.5em;
-    overflow-x: clip;
-    overflow-clip-margin: 0.5em;
-}
-
-p + .adoptables { margin-top: 1em; }
-
-/* Web button lists */
-.web-btn-wrapper {
+/* Web graphic lists */
+.web-graphics {
     display: flex;
     flex-wrap: wrap;
     gap: 0.5em;
@@ -171,6 +156,10 @@ p + .adoptables { margin-top: 1em; }
     overflow-clip-margin: 0.5em;
 }
 
+/* Adoptables wrapper */
+.adoptables { align-items: flex-end; }
+p + .adoptables { margin-top: 1em; }
+
 /* Tabs */
 .tabwrap section { display: none; }
 
diff --git a/src/index.njk b/src/index.njk
index 00c431c1..b572748d 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -72,7 +72,7 @@ eleventyComputed:
             <img src="/assets/buttons/pride/{{ file }}.png" alt="{{ alt }}" data-tooltip-trigger title="{{ tooltip }}" width="{{ width }}" height="{{ height }}" loading="lazy" tabindex="0">
         </li>
     {%- endmacro -%}
-    <ul class="web-btn-wrapper">
+    <ul class="web-graphics">
         {{ prideButton("progress", "2018 Progress Flag", "2018 Progress Flag by Daniel Quasar (2018)") }}
         {{ prideButton("9_stripe", "9 stripe rainbow flag", "Nine-Stripe Rainbow Flag by Gilbert Baker (2017)") }}
         {{ prideButton("lesbian", "Lesbian pride flag", "I am a lesbian") }}
diff --git a/src/links/joined.njk b/src/links/joined.njk
index 9b004411..108b38f3 100644
--- a/src/links/joined.njk
+++ b/src/links/joined.njk
@@ -10,7 +10,7 @@ date: 2023-01-29
 <p>Check out <a href="https://fan.leilukin.com/">Beehive, my fanlisting collective</a> to see all the fanlistings I own, have joined or have applied to join.</p>
 
 <h3>Webrings</h3>
-<ul class="web-btn-wrapper">
+<ul class="web-graphics">
     <li>
         <div id="autiring">
             <script type="text/javascript" src="https://macaque.moe/autiring/onionring-variables.js"></script>
diff --git a/src/links/websites.njk b/src/links/websites.njk
index cf5b4d62..83e3e36a 100644
--- a/src/links/websites.njk
+++ b/src/links/websites.njk
@@ -13,7 +13,7 @@ date: 2023-01-28
 
 <h3>Personal Sites I Enjoy</h3>
 
-<ul class="web-btn-wrapper">
+<ul class="web-graphics">
     {{ siteButton("https://karuma.me/", "sites/10kph.png", "10kph") }}
     {{ siteButton("https://www.autisticasfxxk.com/", "sites/autisticasfxxk.gif", "Autistic As Fxxk") }}
     {{ siteButton("https://chrisburnell.com/", "sites/chrisburnell.gif", "Chris Burnell") }}
@@ -50,7 +50,7 @@ date: 2023-01-28
 </ul>
 
 <h3>Directories</h3>
-<ul class="web-btn-wrapper">
+<ul class="web-graphics">
     {{ siteButton("https://pinkvampyr.leprd.space/accessiblenet/", "directories/accessiblenet.png", "Accessibility Net Directory") }}
     {{ siteButton("https://bukmark.club/", "directories/bukmarkclub.png", "BUKMARK.CLUB") }}
     {{ siteButton("https://indieseek.xyz/", "directories/indieseek.png", "Indieseek.xyz Indie Web Directory") }}
@@ -64,7 +64,7 @@ date: 2023-01-28
 </ul>
 
 <h3>Communities</h3>
-<ul class="web-btn-wrapper">
+<ul class="web-graphics">
     {{ siteButton("https://32bit.cafe/", "communities/32-bit-cafe.png", "32-Bit Cafe") }}
     {{ siteButton("https://zine.kalechips.net/index", "communities/saladmagazine.png", "Salad Magazine") }}
 </ul>
\ No newline at end of file
diff --git a/src/pages/adoptables.njk b/src/pages/adoptables.njk
index d8b1a077..b1e6c5c6 100644
--- a/src/pages/adoptables.njk
+++ b/src/pages/adoptables.njk
@@ -32,7 +32,7 @@ eleventyNavigation:
     <h2>Personal Website Adoptables</h2>
     <p>These are adopted from other personal websites.</p>
 
-    <ul class="adoptables">
+    <ul class="web-graphics adoptables">
         {{ adoptable("https://xandra.cc/", "alexandra-diddles.png", "Diddles the raccoon by Alexandra") }}
         {{ adoptable("https://lostletters.neocities.org/", "lostletters-moomin.png", "Moomin pixel art by Lost Letters") }}
         {{ adoptable("https://pixels.elfwink.net/", "lou-frog.gif", "Green frog by Lou") }}
@@ -59,14 +59,14 @@ eleventyNavigation:
     <p>An old pixel club about cats, revived by <a href="https://divergentrays.com/kitty">Divergent Rays</a>.</p>
 
     <h3>My Kitty Friends</h3>
-    <ul class="adoptables">
+    <ul class="web-graphics adoptables">
         {{ myPixelArt("kittyfriends/leilukin-blackkitty.png", "Leilukin's black kitty friend") }}
         {{ myPixelArt("kittyfriends/leilukin-purplekitty.png", "Leilukin's purple kitty friend") }}
     </ul>
     <p>Created on 21 July 2024. If you want to adopt any of my kitty friends, please link back to my website and do not hotlink the images.</p>
 
     <h3>Adopted Kitty Friends</h3>
-    <ul class="adoptables">
+    <ul class="web-graphics adoptables">
         {{ adoptable("https://artwork.neocities.org/cliques", "kittyfriends/artwork-bat.gif", "artwork's bat kitty") }}
         {{ adoptable("https://artwork.neocities.org/cliques", "kittyfriends/artwork-pumpkin.gif", "artwork's pumpkin kitty") }}
         {{ adoptable("https://artwork.neocities.org/cliques", "kittyfriends/artwork-vampire.gif", "artwork's vampire kitty") }}
@@ -84,7 +84,7 @@ eleventyNavigation:
     <p><a href="https://zine.kalechips.net/index">Salad Magazine</a> is a web-based zine for creative works run by <a href="https://kalechips.net/">Kalechips</a>.</p>
 
     <h3>Ink Snail and Sparkle Snail</h3>
-    <div class="adoptables">
+    <div class="web-graphics adoptables">
         <img src="/assets/adoptables/salad-magazine/semper-inksnail-black.png" alt="Black ink snail pixel art by Semper" loading="lazy">
         <img src="/assets/adoptables/salad-magazine/semper-inksnail-sparkle.png" alt="Sparkle snail pixel art by Semper" loading="lazy">
     </div>
@@ -94,7 +94,7 @@ eleventyNavigation:
 <section class="content__section">
     <h2>32-Bit Cafe Code Jam: Destination Vacation</h2>
     <p>Stuff I collected from <a href="https://tilde.32bit.cafe/~ribose/events/destination/map.html">32-Bit Cafe's Community Code Jam #4: Destination Vacation</a> in June 2024, including a passport with stamps from the code jam entries, and extra goodies from some of the participants.</p>
-    <ul class="adoptables">
+    <ul class="web-graphics adoptables">
         <li>
             <img src="/assets/adoptables/32bitcafe-vacation/passport.png" alt="32-Bit Cafe's Destination Vacation code jam passport with stamps" loading="lazy">
         </li>