From 02eaca8bd26a05e5275d5f3f8e86c63a81bfe48f Mon Sep 17 00:00:00 2001 From: dtb Date: Tue, 20 Dec 2022 23:09:18 -0500 Subject: [PATCH] fuck it push it --- homepage/Makefile | 17 +------------ homepage/css/2023.css | 8 ++++++ homepage/head.m4 | 2 +- homepage/html.m4 | 1 + homepage/index.m4 | 57 +++++++++++++++++++++--------------------- homepage/js/quotes.js | 22 +++++++++------- homepage/navigation.m4 | 13 ---------- homepage/praise.m4 | 27 ++++++++++---------- homepage/services.m4 | 7 +++--- homepage/stickers.m4 | 22 ++-------------- homepage/trinitisms.m4 | 22 +++++++++++----- 11 files changed, 87 insertions(+), 111 deletions(-) create mode 100644 homepage/css/2023.css delete mode 100644 homepage/navigation.m4 diff --git a/homepage/Makefile b/homepage/Makefile index ede803b..323a88d 100644 --- a/homepage/Makefile +++ b/homepage/Makefile @@ -4,22 +4,7 @@ RM = rm -f generate: index.html subdirs -index.html: \ -index.m4 \ -announcement.m4 \ -contact.m4 \ -extensions.m4 \ -faq.m4 \ -gear.m4 \ -head.m4 \ -navigation.m4 \ -now.m4 \ -praise.m4 \ -privacy.m4 \ -services.m4 \ -stickers.m4 \ -trinitisms.m4 \ -zelda.m4 +index.html: *.m4 m4 index.m4 >index.html subdirs: diff --git a/homepage/css/2023.css b/homepage/css/2023.css new file mode 100644 index 0000000..c795fa6 --- /dev/null +++ b/homepage/css/2023.css @@ -0,0 +1,8 @@ +a{ + color: #FF0000; +} + +body{ + background-color: #000000; + color: #FFDBDB; +} diff --git a/homepage/head.m4 b/homepage/head.m4 index a950bbd..4abeec9 100644 --- a/homepage/head.m4 +++ b/homepage/head.m4 @@ -1,7 +1,7 @@ - + diff --git a/homepage/html.m4 b/homepage/html.m4 index f940122..6b7f63b 100644 --- a/homepage/html.m4 +++ b/homepage/html.m4 @@ -1,6 +1,7 @@ define(`_body', `$1')dnl define(`_bold', `$1')dnl define(`_center', `
$1
')dnl +define(`_cite', `$1')dnl define(`_code', `$1')dnl define(`_hyperlink', `$2')dnl define(`_literal_hyperlink', `_hyperlink($1, $1)')dnl diff --git a/homepage/index.m4 b/homepage/index.m4 index 1988f37..5b03234 100644 --- a/homepage/index.m4 +++ b/homepage/index.m4 @@ -12,45 +12,59 @@ include(`head.m4')dnl - +
- + +trinity -

+ STYLE="object-fit: fit" +/> +

Deven Trinity Blake
- トリニティ三
ديفين بلايك - + +

Most people call me Trinity and use _code(`she/her') or genderless pronouns to refer to me. I won't get offended if you use _code(`he/him') but I'll probably be a bit confused. -

-

You can usually find me in the middle or on the wall of the mosh pit.

-include(`navigation.m4')dnl +

Click to jump or navigate to... +blah/, +bookmarks/, +css/, +home/, +phones/, +shitlist/, +X200T; +

This website is an m4 project. The canonical URL for this page is _literal_hyperlink(`https://trinity.moe/').

- include(`services.m4')dnl +include(`stickers.m4')dnl +include(`zelda.m4')dnl +
+

+
+
-_BAR - -include(`faq.m4')dnl _BAR @@ -58,23 +72,10 @@ include(`trinitisms.m4')dnl _BAR -include(`zelda.m4')dnl - -_BAR - include(`praise.m4')dnl _BAR -include(`stickers.m4')dnl - -_BAR - - -

-

- -_BAR

This site is written in vim and tested in the latest Firefox. diff --git a/homepage/js/quotes.js b/homepage/js/quotes.js index 96f1c33..8f8392a 100644 --- a/homepage/js/quotes.js +++ b/homepage/js/quotes.js @@ -11,16 +11,20 @@ * - window.quotes_initialize(); * - use window.quote_new() to get a new quote. */ -/* firefox doesn't support import assertions yet (2022-02-20; fx 97.0) */ -window.quotes = [ ["Couldn't get quotes array.", "quotes.js"] ]; -window.QUOTES_FILE_LOCATION = "/js/quotes.json"; -window.QUOTES_L_QUOTE_MARK = '"'; -window.QUOTES_R_QUOTE_MARK = '"'; -window.QUOTES_QUOTE_AUTHOR_ID = "quote_author"; -window.QUOTES_QUOTE_AUTHOR_PREFIX = "~ "; -window.QUOTES_QUOTE_VALUE_ID = "quote_value"; - window.quotes_initialize = function(){ + var defaults = { + quotes: [ ["Couldn't get quotes array.", "quotes.js"] ], + QUOTES_FILE_LOCATION: "/js/quotes.json", + QUOTES_L_QUOTE_MARK: '"', + QUOTES_R_QUOTE_MARK: '"', + QUOTES_QUOTE_AUTHOR_ID: "quote_author", + QUOTES_QUOTE_AUTHOR_PREFIX: "~ ", + QUOTES_QUOTE_VALUE_ID: "quote_value" + }; + var i; + for(i = 0; i < Object.keys(defaults).length; ++i) + if(Object.keys(window).indexOf(Object.keys(defaults)[i]) == -1) + window[Object.keys(defaults)[i]] = Object.values(defaults)[i]; /* Weird JavaScript web voodoo. */ fetch(window.QUOTES_FILE_LOCATION) .then(response => {return response.json();}) diff --git a/homepage/navigation.m4 b/homepage/navigation.m4 deleted file mode 100644 index e12d96b..0000000 --- a/homepage/navigation.m4 +++ /dev/null @@ -1,13 +0,0 @@ -

Click to jump or navigate to... -living: -bookmarks/, -css/, -home/, -phones/, -shitlist/, -ephemeral: -blah/, -thegame/; -knowledge: -X200T; -

diff --git a/homepage/praise.m4 b/homepage/praise.m4 index 0ecf2fb..fcd0921 100644 --- a/homepage/praise.m4 +++ b/homepage/praise.m4 @@ -1,16 +1,15 @@ -Praise me more. +
+

praise

+define(`_praise_entry', `
  • $1
    • ')dnl +
    diff --git a/homepage/services.m4 b/homepage/services.m4 index b15235a..43e171a 100644 --- a/homepage/services.m4 +++ b/homepage/services.m4 @@ -1,11 +1,11 @@ define(`_service', `$1 as $2')dnl define(`_service_inactive', `_service($1, $2)')dnl -

    Services I'm on include +

    Services I'm on include _service_inactive(`All Things Weezer', `deven'); _service_inactive(`ArchWiki', `deven'); _service_inactive(`Bandcamp', `devenblake'); _service_inactive(`CodeWalrus', `deven'); -_service(`CMRO', `trinity'); +_service_inactive(`CMRO', `trinity'); _service(`Discord', `trinity#3756'); _service_inactive(`GitHub', `devenblake'); _service_inactive(`itch.io', `devenblake'); @@ -19,8 +19,7 @@ _service_inactive(`SpaceHey', `dtb'); _service_inactive(`Substack', `trn1ty'); _service_inactive(`TikTok', `trn1ty'); and _service_inactive(`Wikipedia', `DTB'). -

    - (I also have an IRC server (mirrored to Discord)) +

    The only thing I consistently check is my e-mail, trinity at this domain. I'll reply from a different and possibly temporary address.

    diff --git a/homepage/stickers.m4 b/homepage/stickers.m4 index 2e44fdb..940ce76 100644 --- a/homepage/stickers.m4 +++ b/homepage/stickers.m4 @@ -1,29 +1,11 @@ -

    stickers

    - -trinity.moe. Hypertext on port 80. Click here. - -<A HREF="http://www.trinity.moe"><IMG
    -ALT="trinity.moe. Hypertext on port 80. Click here."
    -SRC="https://ia601509.us.archive.org/31/items/trinitydotmoe88x31/trinitydotmoe88x31.bmp"
    -WIDTH="88px"
    -/></A>
    -     - -trinity.moe! - - -<A HREF="http://www.trinity.moe"><IMG
    -ALT="trinity.moe!"
    -SRC="https://ia801402.us.archive.org/5/items/trinmoe3/trinnow.bmp"
    -WIDTH="88px"
    -/></A>
    -     diff --git a/homepage/trinitisms.m4 b/homepage/trinitisms.m4 index 08d895c..5685341 100644 --- a/homepage/trinitisms.m4 +++ b/homepage/trinitisms.m4 @@ -1,6 +1,15 @@ +

    trinitisms

    -

    ism - A distinctive doctrine, system, or theory. (From the American Heritage(R) Dictionary of the English Language, 5th ed, according to Wordnik.)

    +
    +
    +ism - A distinctive doctrine, system, or theory. +
    +
    +The American Heritage(R) Dictionary of the English Language, 5th ed, according to Wordnik. +
    +
    +

    Trinitisms are decrees I make or terms I coin with no necessary reason. Or terms I use often that people don't know. Some I coined, some I didn't; when in doubt, assume I didn't.

    Trinitism when not used as a proper noun can refer to any given person's own trinitisms.

    @@ -10,7 +19,7 @@ "Disc" refers to optical and physically impressive media, such as compact discs or phonograph discs, and "disk" is for magnetic media, such as floppy disks or hard disks; there are however exceptions and edge cases.
  • -catfella - the non-gender-specific form of "catboy" or "catgirl". +catfella - the non-gender-specific form of "catboy" or "catgirl". (coined 2020-08-11 when referring to my friend Socks) Also in use (though not a Trinitism): nyanbinary.
    • @@ -18,7 +27,7 @@ Also in use (though not a Trinitism): nyanbinary. The continents shall be separated as follows: North America, South America, Eurasia, Africa, India, the middle-East, and Oceania. Though I hope someone important finds individual terms for each America and has a better name for the middle-East if each region's residents generally agree with me that the current naming kind of sucks. -
  • 39 - "Thank you." In Japanese the word for 3 is "san" and the word for 9 is normally "kyuu" so 39 is pronounced "sankyuu".
    • +
  • 39 - "Thank you." In Japanese the word for 3 is "san" and the word for 9 is normally "kyuu" so 39 is pronounced "sankyuu".
  • Antarctica is cool, both literally and figuratively.
  • It's not preferable to drink from plastic.
  • Don't put ice in beverages that aren't water, or they'll get watered down.
    • @@ -27,8 +36,9 @@ Though I hope someone important finds individual terms for each America and has
  • More magic is necessary.
  • The only good programmers are the insane programmers.
  • If less than one half of the packaging is in a non-Latin writing system, the noodles will be sub-par.
    • -
  • home ownership corporation - "home owners' association". A home ownership corporation is exactly that - a corporation that can force you to sell your home if you don't comply with their own rules, separate from the government. Calling it an "association" implies you have power within someone else's corporation.
    • -
  • "supperino neighborino" - "What's up, neighbor?"
    • -
  • pocket gizmo - smart phone
    • +
  • home ownership corporation - "home owners' association". A home ownership corporation is exactly that - a corporation that can force you to sell your home if you don't comply with their own rules, separate from the government. Calling it an "association" implies you have power within someone else's corporation.
    • +
  • "supperino neighborino" - "What's up, neighbor?"
    • +
  • pocket gizmo - smart phone
  • You should steal from the military. Your tax dollars paid for their stuff anyway.
    • +