From bf381cba7ac7fd77c2a07447180ec749bc123a5f Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 4 Jun 2021 04:07:05 +0200 Subject: [PATCH 1/5] add default warning for nsfw stuff --- make-pages/SinglePage.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs index dc8d4d2..9ff5a6d 100644 --- a/make-pages/SinglePage.hs +++ b/make-pages/SinglePage.hs @@ -68,7 +68,12 @@ make' root prefix nsfw dataDir dir info@(Info {date, title, artist, bg}) = do |] - let warning' = ifJust (#warning image0) makeWarning + let defWarning = "oops i forgot to put one, sorry!
\ + \if you can let me know i'd appreciate it" :: Text + let warning' + | Just w <- #warning image0 = makeWarning w + | #nsfw image0 = makeWarning defWarning + | otherwise = mempty let warningT = makeWarning [b|.|] let bgStyle = ifJust bg \col -> [b|@0 From 3b076315bbd4df1283cf2b999a4f719ec2cfa636 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 4 Jun 2021 04:07:23 +0200 Subject: [PATCH 2/5] ignore hasktags --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index da63551..c8cdda1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ fonts/muller/**/*.woff fonts/muller/**/*.woff2 .directory data +tags +TAGS From 223c784f643321e64ecf4be5b87da93ac8829c6a Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Sat, 5 Jun 2021 07:34:59 +0200 Subject: [PATCH 3/5] add .floating.left --- style/shiny/single.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/shiny/single.css b/style/shiny/single.css index d333cd5..2646a4d 100644 --- a/style/shiny/single.css +++ b/style/shiny/single.css @@ -143,6 +143,10 @@ margin-left: 0.8em; } +#info .floating.left { + float: left; +} + #info .shaped { /* maybe one day... */ /* shape-outside: attr(src url); */ From 47fff05d484c0701e318031033cdac3c92456776 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Wed, 18 Aug 2021 05:09:58 +0200 Subject: [PATCH 4/5] fix gap on index page --- style/shiny/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style/shiny/index.css b/style/shiny/index.css index 9cc4d2f..a915631 100644 --- a/style/shiny/index.css +++ b/style/shiny/index.css @@ -67,7 +67,7 @@ align-items: center; justify-content: space-evenly; padding: 0; - grid-gap: 1.5em 0; + grid-gap: 1.5em; font-size: 175%; } From e47b7902420082876e70b8053aef09fee54f9258 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Wed, 18 Aug 2021 05:10:26 +0200 Subject: [PATCH 5/5] check fragment is the right form before using it as filters --- script/gallery.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/gallery.js b/script/gallery.js index 47da313..4a38eb6 100644 --- a/script/gallery.js +++ b/script/gallery.js @@ -100,8 +100,11 @@ function useFragment() { clearForm(); } else { let set = new Set(frag.split(';')); - allBoxes.forEach(b => b.checked = set.has(b.id)); - document.getElementById('filters-details').open = true; + if (new Array(...set).every(x => /^(require|exclude)_/.test(x))) { + allBoxes.forEach(b => b.checked = set.has(b.id)); + let details = document.getElementById('filters-details'); + details.open = !set.has('hide_filters'); + } } updateItems();