From 76e54d0297e84d8ef06370c74c67cee06f6cfedc Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Sun, 19 Jul 2020 22:36:15 +0200 Subject: [PATCH] move current style to subdir --- Makefile | 6 +++--- make-pages/GalleryPage.hs | 2 +- make-pages/IndexPage.hs | 2 +- make-pages/SinglePage.hs | 2 +- style/{ => tum}/base.css | 2 +- style/{ => tum}/border.png | 0 style/{ => tum}/gallery.css | 2 +- style/{ => tum}/index.css | 2 +- style/{ => tum}/single.css | 2 +- style/{ => tum}/spots.png | 0 10 files changed, 10 insertions(+), 10 deletions(-) rename style/{ => tum}/base.css (98%) rename style/{ => tum}/border.png (100%) rename style/{ => tum}/gallery.css (98%) rename style/{ => tum}/index.css (97%) rename style/{ => tum}/single.css (98%) rename style/{ => tum}/spots.png (100%) diff --git a/Makefile b/Makefile index 06175a8..405fbbd 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ YAMLS != find $(DATADIR) -name $(INFONAME) SCRIPTS := $(wildcard script/*.js) -STYLES := $(wildcard style/*.css) -STYLESVGS := $(wildcard style/*.svg) -STYLEPNGS := $(wildcard style/*.png) +STYLES != find style -name '*.css' +STYLESVGS != find style -name '*.svg' +STYLEPNGS != find style -name '*.png' FONTS := $(shell find fonts \ -iname '*.eot' -or -iname '*.svg' -or \ diff --git a/make-pages/GalleryPage.hs b/make-pages/GalleryPage.hs index e92d923..1d0a175 100644 --- a/make-pages/GalleryPage.hs +++ b/make-pages/GalleryPage.hs @@ -27,7 +27,7 @@ make' title nsfw infos = [b|@0 - + $*title diff --git a/make-pages/IndexPage.hs b/make-pages/IndexPage.hs index a7e8583..775f3a0 100644 --- a/make-pages/IndexPage.hs +++ b/make-pages/IndexPage.hs @@ -13,7 +13,7 @@ make' (IndexInfo {title, galleries, links, footer}) = [b|@0 - + $*title diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs index b54a46f..9f99a58 100644 --- a/make-pages/SinglePage.hs +++ b/make-pages/SinglePage.hs @@ -33,7 +33,7 @@ make' nsfw (Info {date, title, artist, tags, nsfwTags, - + $*title diff --git a/style/base.css b/style/tum/base.css similarity index 98% rename from style/base.css rename to style/tum/base.css index e3fd6ad..9ce1a6d 100644 --- a/style/base.css +++ b/style/tum/base.css @@ -1,4 +1,4 @@ -@import url(../fonts/muller/muller.css); +@import url(/fonts/muller/muller.css); html { --thumb-size: 200px; diff --git a/style/border.png b/style/tum/border.png similarity index 100% rename from style/border.png rename to style/tum/border.png diff --git a/style/gallery.css b/style/tum/gallery.css similarity index 98% rename from style/gallery.css rename to style/tum/gallery.css index 2952525..7fcd6bb 100644 --- a/style/gallery.css +++ b/style/tum/gallery.css @@ -42,7 +42,7 @@ body { .item.nsfw::after { --size: calc(1/4 * var(--image-size)); - content: url(18_plus_white.svg); + content: url(../18_plus_white.svg); height: var(--size); width: var(--size); diff --git a/style/index.css b/style/tum/index.css similarity index 97% rename from style/index.css rename to style/tum/index.css index fc9404b..0b74bc9 100644 --- a/style/index.css +++ b/style/tum/index.css @@ -63,7 +63,7 @@ li.nsfw { } .nsfw a::after { - content: url(18_plus.svg); + content: url(../18_plus.svg); display: inline-block; width: 1em; height: 1em; padding-left: 0.15em; diff --git a/style/single.css b/style/tum/single.css similarity index 98% rename from style/single.css rename to style/tum/single.css index 735bcdb..0a92977 100644 --- a/style/single.css +++ b/style/tum/single.css @@ -101,7 +101,7 @@ figcaption p { } .alts .nsfw label::after { - content: url(18_plus.svg); + content: url(../18_plus.svg); display: inline-block; height: 0.8em; width: 0.8em; vertical-align: -0.1em; diff --git a/style/spots.png b/style/tum/spots.png similarity index 100% rename from style/spots.png rename to style/tum/spots.png