From 0095b04aae05ad9aa79046d0c94f6e7c984fb674 Mon Sep 17 00:00:00 2001 From: Leilukin Date: Wed, 3 Jul 2024 18:35:43 +0800 Subject: [PATCH] Create macro for site buttons --- .../{main/mod-entry.njk => global/macros.njk} | 9 + src/_includes/main/links.njk | 2 +- .../main/{site-btn.njk => my-button.njk} | 0 src/_includes/main/webrings.njk | 6 +- src/assets/css/components.css | 1 + src/index.njk | 2 +- src/links/websites.njk | 178 ++++-------------- src/pages/about.md | 2 +- src/projects/videogamemods/kotor1.md | 2 +- src/projects/videogamemods/kotor2.md | 2 +- 10 files changed, 56 insertions(+), 148 deletions(-) rename src/_includes/{main/mod-entry.njk => global/macros.njk} (56%) rename src/_includes/main/{site-btn.njk => my-button.njk} (100%) diff --git a/src/_includes/main/mod-entry.njk b/src/_includes/global/macros.njk similarity index 56% rename from src/_includes/main/mod-entry.njk rename to src/_includes/global/macros.njk index d9a1377f..450c9a0a 100644 --- a/src/_includes/main/mod-entry.njk +++ b/src/_includes/global/macros.njk @@ -1,3 +1,12 @@ +{%- macro siteButton(url, file, alt, tooltip=alt, width=88, height=31) -%} +
  • + + {{ alt }} + +

    {{ tooltip }}

    +
    • +{%- endmacro -%} + {%- macro modEntry(params) -%} ### {{ params.title }}
    diff --git a/src/_includes/main/links.njk b/src/_includes/main/links.njk index ee43fb35..f9c905fc 100644 --- a/src/_includes/main/links.njk +++ b/src/_includes/main/links.njk @@ -7,7 +7,7 @@ isContentDivided: true

    Link to My Website

    - {% include "main/site-btn.njk" %} + {% include "main/my-button.njk" %}
    diff --git a/src/_includes/main/site-btn.njk b/src/_includes/main/my-button.njk similarity index 100% rename from src/_includes/main/site-btn.njk rename to src/_includes/main/my-button.njk diff --git a/src/_includes/main/webrings.njk b/src/_includes/main/webrings.njk index 1445eff1..89e2ab7f 100644 --- a/src/_includes/main/webrings.njk +++ b/src/_includes/main/webrings.njk @@ -1,8 +1,8 @@
    • -
      +
      - +
    • @@ -41,7 +41,7 @@ left arrow   - queer coded webring + queer coded webring   right arrow diff --git a/src/assets/css/components.css b/src/assets/css/components.css index 3c21be2b..7f772e81 100644 --- a/src/assets/css/components.css +++ b/src/assets/css/components.css @@ -139,6 +139,7 @@ p + .adoptables { margin-top: 1em; } background-color: var(--clr-quote-bg); border: 0.15em solid var(--clr-main-heading); padding: 0.25em 0.5em; + z-index: 998; } /* Web button lists */ diff --git a/src/index.njk b/src/index.njk index 586a0b10..f614b7d4 100644 --- a/src/index.njk +++ b/src/index.njk @@ -36,7 +36,7 @@ eleventyComputed:

      Link to My Website

      - {% include "main/site-btn.njk" %} + {% include "main/my-button.njk" %}
      diff --git a/src/links/websites.njk b/src/links/websites.njk index 60be37c3..ec2c6873 100644 --- a/src/links/websites.njk +++ b/src/links/websites.njk @@ -3,108 +3,38 @@ title: Websites date: 2023-01-28 --- +{%- macro siteButton(url, file, alt, tooltip=alt, width=88, height=31) -%} +
    • + + {{ alt }} + +

      {{ tooltip }}

      +
      • +{%- endmacro -%} +

      Personal Sites I Enjoy

      +
        -
      • - - 10kph - -
        • -
      • - - Autistic As Fxxk - -
        • -
      • - - Divergent Rays - -
        • -
      • - - Dryad Glen - -
        • -
      • - - Frills - -
        • -
      • - - Grounded Wren - -
        • -
      • - - jasmine's journal - -
        • -
      • - - JEFBECKER - -
        • -
      • - - Kalechips - -
        • -
      • - - Lost Letters - -
        • -
      • - - Macaque - -
        • -
      • - - Mycorrhiza's Space - -
        • -
      • - - Owl's Roost - -
        • -
      • - - Pinkvampyr - -
        • -
      • - - Sanguine Royal - -
        • -
      • - - Solaria's Webspace - -
        • -
      • - - 🤘 starbreaker.org 🤘 - -
        • -
      • - - sym's living room 🍨 - -
        • -
      • - - Whiona - -
        • -
      • - - Museum of Alexandra - -
        • + {{ siteButton("https://karuma.me/", "sites/10kph.png", "10kph") }} + {{ siteButton("https://www.autisticasfxxk.com/", "sites/autisticasfxxk.gif", "Autistic As Fxxk") }} + {{ siteButton("ttps://divergentrays.com/", "sites/divergentrays.png", "Divergent Rays") }} + {{ siteButton("https://cyberneticdryad.neocities.org/", "sites/dryadglen.png", "Dryad Glen") }} + {{ siteButton("https://frills.dev/", "sites/frills.png", "Frills") }} + {{ siteButton("https://groundedwren.com/", "sites/groundedwren.png", "Grounded Wren") }} + {{ siteButton("https://jasm1nii.xyz/", "sites/jasminesjournal.png", "jasmine's journal") }} + {{ siteButton("https://jefbecker.com/", "sites/jefbecker.png", "JEFBECKER") }} + {{ siteButton("https://kalechips.net/", "sites/kalechips.png", "Kalechips") }} + {{ siteButton("https://lostletters.neocities.org/", "sites/lostletters.gif", "Lost Letters") }} + {{ siteButton("https://macaque.moe/", "sites/macaque.png", "Macaque") }} + {{ siteButton("https://mycorrhiza.space/", "sites/mycorrhiza.png", "Mycorrhiza's Space") }} + {{ siteButton("https://owlsroost.xyz/", "sites/owlsroost.gif", "Owl's Roost") }} + {{ siteButton("https://pinkvampyr.leprd.space/", "sites/pinkvampyr.gif", "Pinkvampyr") }} + {{ siteButton("https://sanguineroyal.com/", "sites/sanguineroyal.gif", "Sanguine Royal") }} + {{ siteButton("https://solaria.neocities.org/", "sites/solaria.png", "Solaria's Webspace") }} + {{ siteButton("https://starbreaker.org/", "sites/starbreaker.avif", "🤘 starbreaker.org 🤘") }} + {{ siteButton("https://symliadoo.com/", "sites/symliadoo.png", "sym's living room 🍨") }} + {{ siteButton("https://whiona.me/", "sites/whiona.png", "Whiona") }} + {{ siteButton("https://xandra.cc/", "sites/xandra.png", "Museum of Alexandra") }}

      Link Exchanges

      @@ -114,50 +44,18 @@ date: 2023-01-28

      Directories

        -
      • - - Accessible Net Directory - -
        • -
      • - - Indieseek.xyz Indie Web Directory - -
        • -
      • - - Link Lane - -
        • -
      • - - List-Me.com - -
        • -
      • - - Responsive Web Directory - -
        • -
      • - - Smooth Sailing Listings - -
        • + {{ siteButton("https://pinkvampyr.leprd.space/accessiblenet/", "directories/accessiblenet.png", "Accessibility Net Directory") }} + {{ siteButton("https://indieseek.xyz/", "directories/indieseek.png", "Indieseek.xyz Indie Web Directory") }} + {{ siteButton("https://linklane.net/", "directories/linklane.png", "Link Lane") }} + {{ siteButton("https://list-me.com/", "directories/list-me.png", "List-Me.com") }} + {{ siteButton("https://kalechips.net/responsive/", "directories/responsiveweb.png", "Responsive Web Directory") }} + {{ siteButton("https://smoothsailing.asclaria.org/", "directories/smoothsailing.png", "Smooth Sailing Listings") }}

      Communities

        -
      • - - 32-Bit Cafe - -
        • -
      • - - Salad Magazine - -
        • + {{ siteButton("https://32bit.cafe/", "communities/32-bit-cafe.png", "32-Bit Cafe") }} + {{ siteButton("https://zine.kalechips.net/index", "communities/saladmagazine.png", "Salad Magazine") }}

      Fanlistings

      diff --git a/src/pages/about.md b/src/pages/about.md index 3d8384d4..4928b6a8 100644 --- a/src/pages/about.md +++ b/src/pages/about.md @@ -28,7 +28,7 @@ More information about this site can be found on the following pages: ### Link to This Site -{% include "main/site-btn.njk" %} +{% include "main/my-button.njk" %} {% endcontainer %} {% container "article", "content__section" %} diff --git a/src/projects/videogamemods/kotor1.md b/src/projects/videogamemods/kotor1.md index d390617f..d32a1e99 100644 --- a/src/projects/videogamemods/kotor1.md +++ b/src/projects/videogamemods/kotor1.md @@ -13,7 +13,7 @@ eleventyNavigation: If your issue is not addressed on my mod's page, ask for support or report issues with my mods on the mod's page on Deadly Stream, Nexus Mods or [send me an email]({{sitemeta.siteAuthor.email}}). -{% from "main/mod-entry.njk" import modEntry %} +{% from "global/macros.njk" import modEntry %} ## Player & Party Members diff --git a/src/projects/videogamemods/kotor2.md b/src/projects/videogamemods/kotor2.md index a51874d9..e6d0d07d 100644 --- a/src/projects/videogamemods/kotor2.md +++ b/src/projects/videogamemods/kotor2.md @@ -13,7 +13,7 @@ eleventyNavigation: If your issue is not addressed on my mod's page, ask for support or report issues with my mods on the mod's page on Deadly Stream, Nexus Mods or [send me an email]({{sitemeta.siteAuthor.email}}). -{% from "main/mod-entry.njk" import modEntry %} +{% from "global/macros.njk" import modEntry %} ## Important Note for Steam Users