From 28eb19ff41835fc6c7b820f9fa8fed7863ec87e5 Mon Sep 17 00:00:00 2001
From: Rhiannon Morris <rhi@rhiannon.website>
Date: Sun, 22 Sep 2024 21:39:06 +0200
Subject: [PATCH] move styles and scripts into directories

---
 Makefile                        |  4 +--
 index.html                      | 12 ++++----
 run.ts => script/run.ts         |  0
 shuffle.ts => script/shuffle.ts |  0
 base.css => style/base.css      | 50 ++++++++++++++++-----------------
 cube.css => style/cube.css      |  0
 flat.css => style/flat.css      |  0
 static.css => style/static.css  |  0
 8 files changed, 33 insertions(+), 33 deletions(-)
 rename run.ts => script/run.ts (100%)
 rename shuffle.ts => script/shuffle.ts (100%)
 rename base.css => style/base.css (87%)
 rename cube.css => style/cube.css (100%)
 rename flat.css => style/flat.css (100%)
 rename static.css => style/static.css (100%)

diff --git a/Makefile b/Makefile
index 53021fa..c2e772a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CSS   = $(wildcard *.css) $(shell find fonts -type f)
+CSS   = $(wildcard style/*.css) $(shell find fonts -type f)
 PAGES = index.html pubkey.txt
 MEDIA = \
   $(wildcard media/*.png) $(wildcard media/*.gif) $(wildcard media/*.webp) \
   $(wildcard media/flags/*) $(wildcard media/buttons/*) \
   $(wildcard media/icons/*) $(wildcard media/bg/*) 8831.png 8831-quox.png
-SCRIPTS = $(patsubst %.ts,%.js,$(wildcard *.ts))
+SCRIPTS = $(patsubst %.ts,%.js,$(wildcard script/*.ts))
 MISC  = $(shell find .well-known -type f)
 ALL   = $(CSS) $(PAGES) $(MEDIA) $(SCRIPTS) $(MISC)
 
diff --git a/index.html b/index.html
index b1955db..eb90d20 100644
--- a/index.html
+++ b/index.html
@@ -9,11 +9,11 @@
 <link rel=me href=https://cohost.org/niss>
 
 <link rel=icon href=media/favicon.png>
-<link rel=stylesheet href=base.css>
-<link rel=stylesheet href=cube.css>
-<link rel=stylesheet href=flat.css>
+<link rel=stylesheet href=style/base.css>
+<link rel=stylesheet href=style/cube.css>
+<link rel=stylesheet href=style/flat.css>
 <noscript>
-  <link rel=stylesheet href=static.css>
+  <link rel=stylesheet href=style/static.css>
 </noscript>
 
 <meta property=og:type content=article>
@@ -26,8 +26,8 @@
 <meta name=twitter:image content="XXXXXX">
 -->
 
-<script src=shuffle.js type=module></script>
-<script src=run.js type=module></script>
+<script src=script/shuffle.js type=module></script>
+<script src=script/run.js type=module></script>
 
 <nav id=face-menu>
   <menu class='menu hide-boxes'>
diff --git a/run.ts b/script/run.ts
similarity index 100%
rename from run.ts
rename to script/run.ts
diff --git a/shuffle.ts b/script/shuffle.ts
similarity index 100%
rename from shuffle.ts
rename to script/shuffle.ts
diff --git a/base.css b/style/base.css
similarity index 87%
rename from base.css
rename to style/base.css
index c315986..a9b8e02 100644
--- a/base.css
+++ b/style/base.css
@@ -1,4 +1,4 @@
-@import url(fonts/muller/muller.css) (prefers-reduced-data: no-preference);
+@import url(../fonts/muller/muller.css) (prefers-reduced-data: no-preference);
 
 
 /* OUTER */
@@ -197,20 +197,20 @@ strong { font-weight: 700; }
 
 /* extra #cube selector for specificity */
 #cube #hello {
-  --bg-image: url(media/wave.png);
+  --bg-image: url(../media/wave.png);
   background:
     var(--bg-image) bottom right / auto 60% no-repeat,
     var(--base-background);
 }
 
 @media (prefers-color-scheme: dark) {
-  #cube #hello { --bg-image: url(media/wave-neon.png); }
+  #cube #hello { --bg-image: url(../media/wave-neon.png); }
 }
 @media (prefers-reduced-data: reduce) {
-  #cube #hello { --bg-image: url(media/wave.webp); }
+  #cube #hello { --bg-image: url(../media/wave.webp); }
 }
 @media (prefers-color-scheme: dark) and (prefers-reduced-data: reduce) {
-  #cube #hello { --bg-image: url(media/wave-neon.webp); }
+  #cube #hello { --bg-image: url(../media/wave-neon.webp); }
 }
 
 #id, #id ::selection, #flags img {
@@ -253,7 +253,7 @@ strong { font-weight: 700; }
 
 #cube #activities {
   /* height of quobl.png is 58% of width */
-  --bg-image: url(media/quobl.png);
+  --bg-image: url(../media/quobl.png);
   background:
     var(--bg-image) bottom left 2ex / 50% auto no-repeat local,
     var(--base-background);
@@ -261,13 +261,13 @@ strong { font-weight: 700; }
 }
 
 @media (prefers-color-scheme: dark) {
-  #cube #activities { --bg-image: url(media/quobl-neon.png); }
+  #cube #activities { --bg-image: url(../media/quobl-neon.png); }
 }
 @media (prefers-reduced-data: reduce) {
-  #cube #activities { --bg-image: url(media/quobl.webp); }
+  #cube #activities { --bg-image: url(../media/quobl.webp); }
 }
 @media (prefers-color-scheme: dark) and (prefers-reduced-data: reduce) {
-  #cube #activities { --bg-image: url(media/quobl-neon.png); }
+  #cube #activities { --bg-image: url(../media/quobl-neon.png); }
 }
 
 #links, #links ::selection {
@@ -307,21 +307,21 @@ strong { font-weight: 700; }
 #links a:hover { text-decoration: none; }
 
 #links #gallery {
-  --icon: url(media/favicon.png);
+  --icon: url(../media/favicon.png);
   --fg:   hsl(280deg 38% 43%);
   --bg:   hsl(100deg 99% 81%);
   image-rendering: pixelated;
 }
 
 #links #code {
-  --icon: url(media/icons/forgejo.svg);
+  --icon: url(../media/icons/forgejo.svg);
   --fg: white;
   --icon-bg: #171e26;
   --bg: #c2410c;
 }
 
 #links #blog {
-  --icon: url(media/icons/blog.png);
+  --icon: url(../media/icons/blog.png);
   --fg: #ffeebb;
   --bg: #332255;
   /* image-rendering: pixelated; */
@@ -332,61 +332,61 @@ strong { font-weight: 700; }
 }
 
 #links #itaku {
-  --icon: url(media/icons/itaku.svg);
+  --icon: url(../media/icons/itaku.svg);
   --fg:   #ffeb3b;
   --bg:   #303030;
 }
 
 #links #weasyl {
-  --icon: url(media/icons/weasyl.svg);
+  --icon: url(../media/icons/weasyl.svg);
   --fg:   white;
   --bg:   #970000;
 }
 
 #links #fa {
-  --icon: url(media/icons/furaffinity.png);
+  --icon: url(../media/icons/furaffinity.png);
   --icon-bg: #20242a;
   --bg:      #353b45;
   --fg:      white;
 }
 
 #links #da {
-  --icon: url(media/icons/deviantart.png);
+  --icon: url(../media/icons/deviantart.png);
   --icon-bg: #000608;
   --bg: #314537;
   --fg: #e7ede4;
 }
 
 #links #kofi {
-  --icon: url(media/icons/ko-fi.webp);
+  --icon: url(../media/icons/ko-fi.webp);
   --icon-bg: #def3ff;
   --bg: white;
   --fg: #ff5966;
 }
 
 #links #artfight {
-  --icon: url(media/icons/artfight.png);
+  --icon: url(../media/icons/artfight.png);
   --icon-bg: #222222;
   --bg: #a65178;
   --fg: white;
 }
 
 #links #chitter {
-  --icon: url(media/icons/chitter.png);
+  --icon: url(../media/icons/chitter.png);
   --bg: #582c58;
   --icon-bg: #2c162c;
   --fg: white;
 }
 
 #links #cohost {
-  --icon: url(media/icons/cohost.svg);
+  --icon: url(../media/icons/cohost.svg);
   --bg: #ffab5c;
   --icon-bg: #83254f;
   --fg: black;
 }
 
 #links #bluesky {
-  --icon: url(media/icons/bluesky.svg);
+  --icon: url(../media/icons/bluesky.svg);
   --bg: #161e27;
   --fg: white;
 }
@@ -501,18 +501,18 @@ strong { font-weight: 700; }
 }
 
 #cube #six {
-  --bg-image: url(media/kesi.png);
+  --bg-image: url(../media/kesi.png);
   background:
     var(--bg-image) bottom right / 100% auto no-repeat,
     var(--base-background);
 }
 
 @media (prefers-color-scheme: dark) {
-  #cube #six { --bg-image: url(media/kesi-neon.png); }
+  #cube #six { --bg-image: url(../media/kesi-neon.png); }
 }
 @media (prefers-reduced-data: reduce) {
-  #cube #activities { --bg-image: url(media/kesi.webp); }
+  #cube #activities { --bg-image: url(../media/kesi.webp); }
 }
 @media (prefers-color-scheme: dark) and (prefers-reduced-data: reduce) {
-  #cube #activities { --bg-image: url(media/kesi-neon.webp); }
+  #cube #activities { --bg-image: url(../media/kesi-neon.webp); }
 }
diff --git a/cube.css b/style/cube.css
similarity index 100%
rename from cube.css
rename to style/cube.css
diff --git a/flat.css b/style/flat.css
similarity index 100%
rename from flat.css
rename to style/flat.css
diff --git a/static.css b/style/static.css
similarity index 100%
rename from static.css
rename to style/static.css