diff --git a/Makefile b/Makefile index 59126da..22ae81d 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,20 @@ PAGES = index.html pubkey.txt rainbow-quox/index.html \ - dnd/index.html $(wildcard dnd/*/index.html) + # dnd/index.html $(wildcard dnd/*/index.html) MEDIA = \ $(wildcard media/*.png) $(wildcard media/*.gif) $(wildcard media/*.webp) \ + $(wildcard media/*.svg) \ $(wildcard media/flags/*) $(wildcard media/buttons/*) \ $(wildcard media/icons/*) $(wildcard media/bg/*) 8831.png 8831-quox.png \ $(wildcard rainbow-quox/front/*) $(wildcard rainbow-quox/back/*) \ $(wildcard rainbow-quox/*.svg) rainbow-quox/palette.svg \ - $(wildcard dnd/*.png) $(wildcard dnd/*.webp) $(wildcard dnd/*/*.webp) + # $(wildcard dnd/*.png) $(wildcard dnd/*.webp) $(wildcard dnd/*/*.webp) CSS = $(shell find fonts -type f) \ $(patsubst %.scss,%.css, \ $(wildcard rainbow-quox/style/*) $(wildcard style/*)) \ - dnd/base.css dnd/bio.css dnd/index.css $(wildcard dnd/*/style.css) -SCRIPTS = $(patsubst %.ts,%.js,$(wildcard script/*.ts rainbow-quox/script/*.ts)) + # dnd/base.css dnd/bio.css dnd/index.css $(wildcard dnd/*/style.css) +SCRIPTS = $(patsubst %.ts,%.js, \ + $(wildcard script/*.ts rainbow-quox/script/color/*.ts \ + rainbow-quox/script/*.ts)) MISC = $(shell find .well-known -type f) ALL = $(CSS) $(PAGES) $(MEDIA) $(SCRIPTS) $(MISC) diff --git a/fonts/muller/muller.css b/fonts/muller/muller.css index fe3d69a..b63ff7e 100644 --- a/fonts/muller/muller.css +++ b/fonts/muller/muller.css @@ -2,11 +2,8 @@ font-family: Muller; font-weight: 50; src: - url(050.eot) format('embedded-opentype'), - url(050.svg) format('svg'), - url(050.ttf) format('truetype'), - url(050.woff) format('woff'), - url(050.woff2) format('woff2'); + url(050.woff2) format('woff2'), + url(050.ttf) format('truetype'); } @font-face { @@ -14,22 +11,16 @@ font-weight: 50; font-style: italic; src: - url(050i.eot) format('embedded-opentype'), - url(050i.svg) format('svg'), - url(050i.ttf) format('truetype'), - url(050i.woff) format('woff'), - url(050i.woff2) format('woff2'); + url(050i.woff2) format('woff2'), + url(050i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 100; src: - url(100.eot) format('embedded-opentype'), - url(100.svg) format('svg'), - url(100.ttf) format('truetype'), - url(100.woff) format('woff'), - url(100.woff2) format('woff2'); + url(100.woff2) format('woff2'), + url(100.ttf) format('truetype'); } @font-face { @@ -37,22 +28,16 @@ font-weight: 100; font-style: italic; src: - url(100i.eot) format('embedded-opentype'), - url(100i.svg) format('svg'), - url(100i.ttf) format('truetype'), - url(100i.woff) format('woff'), - url(100i.woff2) format('woff2'); + url(100i.woff2) format('woff2'), + url(100i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 200; src: - url(200.eot) format('embedded-opentype'), - url(200.svg) format('svg'), - url(200.ttf) format('truetype'), - url(200.woff) format('woff'), - url(200.woff2) format('woff2'); + url(200.woff2) format('woff2'), + url(200.ttf) format('truetype'); } @font-face { @@ -60,22 +45,16 @@ font-weight: 200; font-style: italic; src: - url(200i.eot) format('embedded-opentype'), - url(200i.svg) format('svg'), - url(200i.ttf) format('truetype'), - url(200i.woff) format('woff'), - url(200i.woff2) format('woff2'); + url(200i.woff2) format('woff2'), + url(200i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 300; src: - url(300.eot) format('embedded-opentype'), - url(300.svg) format('svg'), - url(300.ttf) format('truetype'), - url(300.woff) format('woff'), - url(300.woff2) format('woff2'); + url(300.woff2) format('woff2'), + url(300.ttf) format('truetype'); } @font-face { @@ -83,22 +62,16 @@ font-weight: 300; font-style: italic; src: - url(300i.eot) format('embedded-opentype'), - url(300i.svg) format('svg'), - url(300i.ttf) format('truetype'), - url(300i.woff) format('woff'), - url(300i.woff2) format('woff2'); + url(300i.woff2) format('woff2'), + url(300i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 400; src: - url(400.eot) format('embedded-opentype'), - url(400.svg) format('svg'), - url(400.ttf) format('truetype'), - url(400.woff) format('woff'), - url(400.woff2) format('woff2'); + url(400.woff2) format('woff2'), + url(400.ttf) format('truetype'); } @font-face { @@ -106,22 +79,16 @@ font-weight: 400; font-style: italic; src: - url(400i.eot) format('embedded-opentype'), - url(400i.svg) format('svg'), - url(400i.ttf) format('truetype'), - url(400i.woff) format('woff'), - url(400i.woff2) format('woff2'); + url(400i.woff2) format('woff2'), + url(400i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 500; src: - url(500.eot) format('embedded-opentype'), - url(500.svg) format('svg'), - url(500.ttf) format('truetype'), - url(500.woff) format('woff'), - url(500.woff2) format('woff2'); + url(500.woff2) format('woff2'), + url(500.ttf) format('truetype'); } @font-face { @@ -129,22 +96,16 @@ font-weight: 500; font-style: italic; src: - url(500i.eot) format('embedded-opentype'), - url(500i.svg) format('svg'), - url(500i.ttf) format('truetype'), - url(500i.woff) format('woff'), - url(500i.woff2) format('woff2'); + url(500i.woff2) format('woff2'), + url(500i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 600; src: - url(600.eot) format('embedded-opentype'), - url(600.svg) format('svg'), - url(600.ttf) format('truetype'), - url(600.woff) format('woff'), - url(600.woff2) format('woff2'); + url(600.woff2) format('woff2'), + url(600.ttf) format('truetype'); } @font-face { @@ -152,22 +113,16 @@ font-weight: 600; font-style: italic; src: - url(600i.eot) format('embedded-opentype'), - url(600i.svg) format('svg'), - url(600i.ttf) format('truetype'), - url(600i.woff) format('woff'), - url(600i.woff2) format('woff2'); + url(600i.woff2) format('woff2'), + url(600i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 700; src: - url(700.eot) format('embedded-opentype'), - url(700.svg) format('svg'), - url(700.ttf) format('truetype'), - url(700.woff) format('woff'), - url(700.woff2) format('woff2'); + url(700.woff2) format('woff2'), + url(700.ttf) format('truetype'); } @font-face { @@ -175,22 +130,16 @@ font-weight: 700; font-style: italic; src: - url(700i.eot) format('embedded-opentype'), - url(700i.svg) format('svg'), - url(700i.ttf) format('truetype'), - url(700i.woff) format('woff'), - url(700i.woff2) format('woff2'); + url(700i.woff2) format('woff2'), + url(700i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 800; src: - url(800.eot) format('embedded-opentype'), - url(800.svg) format('svg'), - url(800.ttf) format('truetype'), - url(800.woff) format('woff'), - url(800.woff2) format('woff2'); + url(800.woff2) format('woff2'), + url(800.ttf) format('truetype'); } @font-face { @@ -198,22 +147,16 @@ font-weight: 800; font-style: italic; src: - url(800i.eot) format('embedded-opentype'), - url(800i.svg) format('svg'), - url(800i.ttf) format('truetype'), - url(800i.woff) format('woff'), - url(800i.woff2) format('woff2'); + url(800i.woff2) format('woff2'), + url(800i.ttf) format('truetype'); } @font-face { font-family: Muller; font-weight: 900; src: - url(900.eot) format('embedded-opentype'), - url(900.svg) format('svg'), - url(900.ttf) format('truetype'), - url(900.woff) format('woff'), - url(900.woff2) format('woff2'); + url(900.woff2) format('woff2'), + url(900.ttf) format('truetype'); } @font-face { @@ -221,9 +164,6 @@ font-weight: 900; font-style: italic; src: - url(900i.eot) format('embedded-opentype'), - url(900i.svg) format('svg'), - url(900i.ttf) format('truetype'), - url(900i.woff) format('woff'), - url(900i.woff2) format('woff2'); + url(900i.woff2) format('woff2'), + url(900i.ttf) format('truetype'); } diff --git a/index.html b/index.html index 68ab674..619900e 100644 --- a/index.html +++ b/index.html @@ -29,8 +29,7 @@ - - +