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

fix some markup bits

Browse source
This commit is contained in:
Rhiannon Morris 2020-08-04 18:26:36 +02:00
parent 739cc49c0c
commit e19bbe554e
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
make-pages/SinglePage.hs
View file

@ -56,19 +56,17 @@ make' nsfw dir info@(Info {date, title, artist}) = [b|@0
</a> </a>
</figure> </figure>
<section id=info> <div id=info>
$descSection $descSection
$tagsList $tagsList
$linksList $linksList
</section> </div>
</main> </main>
<footer> <footer>
<nav id=back> <a href=$@undir>back to gallery</a>
<a href=$@undir>back to gallery</a>
</nav>
</footer> </footer>
|] |]
where where
@ -121,7 +119,7 @@ makeButtonBar title images =
0 -> throw $ NoEligibleImages title 0 -> throw $ NoEligibleImages title
1 -> "" 1 -> ""
_ -> [b|@0 _ -> [b|@0
<nav id=alts> <nav id=alts aria-label="alternate versions">
<ul class="buttonbar choice"> <ul class="buttonbar choice">
$4.alts $4.alts
</ul> </ul>
@ -147,12 +145,12 @@ altButton i (Image {label, path, nsfw, warning}) = [b|@4
makeTags :: [Strict.Text] -> Builder makeTags :: [Strict.Text] -> Builder
makeTags tags = makeTags tags =
if null tags then "" else [b|@4 if null tags then "" else [b|@4
<section id=tags> <nav id=tags class=info-section>
<h2>tags</h2> <h2>tags</h2>
<ul class=buttonbar> <ul class=buttonbar>
$8.tagList $8.tagList
</ul> </ul>
</section> </nav>
|] |]
where where
tagList = map makeTag tags tagList = map makeTag tags
@ -161,17 +159,17 @@ makeTags tags =
extLinks :: [Link] -> Builder extLinks :: [Link] -> Builder
extLinks links = extLinks links =
if null links then "" else [b|@4 if null links then "" else [b|@4
<section id=links> <nav id=links class=info-section>
<h2>links</h2> <h2>links</h2>
<ul class=buttonbar> <ul class="buttonbar bb-links">
$8.linkList $8.linkList
</ul> </ul>
</section> </nav>
|] |]
where linkList = map extLink links where linkList = map extLink links
extLink :: Link -> Builder extLink :: Link -> Builder
extLink (Link {title, url}) = [b|@6 extLink (Link {title, url}) = [b|@8
<li> <li>
<a href="$*url"> <a href="$*url">
$*title $*title

9
style/shiny/single.css
View file

@ -75,13 +75,16 @@ body {
content: url(../18_plus.svg); content: url(../18_plus.svg);
} }
#info section { #info {
max-width: 80%;
margin: auto;
}
.info-section {
display: grid; display: grid;
grid-template-columns: 10% auto; grid-template-columns: 10% auto;
grid-gap: 2em; grid-gap: 2em;
align-items: baseline; align-items: baseline;
max-width: 80%;
margin: auto;
} }
#info h2, #info ul, #info p { #info h2, #info ul, #info p {