rhi/gallery
1
0
Fork 0
Code Issues 5 Pull requests 1 Releases Wiki Activity

remove background stuff that didnt work

Browse source
This commit is contained in:
Rhiannon Morris 2020-07-22 00:11:14 +02:00
parent e719d41110
commit 488a4cdd08
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make-pages/Info.hs
View file

@ -34,7 +34,6 @@ data Info =
nsfwTags :: ![Text], nsfwTags :: ![Text],
description :: !(Maybe Text), description :: !(Maybe Text),
images :: ![Image], images :: ![Image],
background :: !(Maybe Text),
thumb' :: !(Maybe FilePath), thumb' :: !(Maybe FilePath),
links :: ![Link] links :: ![Link]
} }
@ -101,7 +100,6 @@ instance FromYAML Info where
<*> m .:? "nsfw-tags" .!= [] <*> m .:? "nsfw-tags" .!= []
<*> m .:? "description" <*> m .:? "description"
<*> (m .: "images" >>= imageList) <*> (m .: "images" >>= imageList)
<*> m .:? "background"
<*> m .:? "thumb" <*> m .:? "thumb"
<*> m .:? "links" .!= [] <*> m .:? "links" .!= []

5
make-pages/SinglePage.hs
View file

@ -28,7 +28,7 @@ make nsfw = toLazyText . make' nsfw
make' :: Bool -> Info -> Builder make' :: Bool -> Info -> Builder
make' nsfw (Info {date, title, artist, tags, nsfwTags, make' nsfw (Info {date, title, artist, tags, nsfwTags,
description, images, background, links}) = [b|@0 description, images, links}) = [b|@0
<!DOCTYPE html> <!DOCTYPE html>
<html lang=en> <html lang=en>
<meta charset=utf-8> <meta charset=utf-8>
@ -48,7 +48,7 @@ make' nsfw (Info {date, title, artist, tags, nsfwTags,
<script async src=/script/single.js></script> <script async src=/script/single.js></script>
<main> <main>
<figure id=mainfig$dataBg> <figure id=mainfig>
$warning' $warning'
<a id=mainlink href="$@path0"> <a id=mainlink href="$@path0">
<img id=mainimg src="$@path0'"> <img id=mainimg src="$@path0'">
@ -84,7 +84,6 @@ make' nsfw (Info {date, title, artist, tags, nsfwTags,
tagsList = makeTags nsfw tags nsfwTags tagsList = makeTags nsfw tags nsfwTags
linksList = extLinks nsfw links linksList = extLinks nsfw links
dataBg = ifJust background \bg -> [b| data-bg="$*bg"|]
warning' = ifJust (#warning image0) \w -> [b|@4 warning' = ifJust (#warning image0) \w -> [b|@4
<figcaption id=cw> <figcaption id=cw>
<span id=cw-text>cw: <b>$*w</b></span> <span id=cw-text>cw: <b>$*w</b></span>