diff --git a/.gitignore b/.gitignore index 69416f3..5310b7b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ public/ .idea/ scripts/venv tmp/ +.png~ diff --git a/assets/3d.png b/assets/3d.png index 7919864..a608b50 100644 Binary files a/assets/3d.png and b/assets/3d.png differ diff --git a/assets/3d.png~ b/assets/3d.png~ new file mode 100644 index 0000000..b0c5375 Binary files /dev/null and b/assets/3d.png~ differ diff --git a/assets/characters.png b/assets/characters.png new file mode 100644 index 0000000..4938ed5 Binary files /dev/null and b/assets/characters.png differ diff --git a/assets/characters.png~ b/assets/characters.png~ new file mode 100644 index 0000000..0231c9f Binary files /dev/null and b/assets/characters.png~ differ diff --git a/assets/comic.png b/assets/comic.png deleted file mode 100644 index d5284d8..0000000 Binary files a/assets/comic.png and /dev/null differ diff --git a/assets/fanart.png b/assets/fanart.png new file mode 100644 index 0000000..c020cff Binary files /dev/null and b/assets/fanart.png differ diff --git a/assets/fanart.png~ b/assets/fanart.png~ new file mode 100644 index 0000000..ce7a6a9 Binary files /dev/null and b/assets/fanart.png~ differ diff --git a/assets/guest.png b/assets/guest.png new file mode 100644 index 0000000..c5e381c Binary files /dev/null and b/assets/guest.png differ diff --git a/assets/guest.png~ b/assets/guest.png~ new file mode 100644 index 0000000..4f27605 Binary files /dev/null and b/assets/guest.png~ differ diff --git a/assets/icons/3d.svg b/assets/icons/3d.svg new file mode 100644 index 0000000..1ffb456 --- /dev/null +++ b/assets/icons/3d.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/assets/icons/animation.svg b/assets/icons/animation.svg new file mode 100644 index 0000000..678fd09 --- /dev/null +++ b/assets/icons/animation.svg @@ -0,0 +1,8 @@ + + + + diff --git a/assets/icons/comic.svg b/assets/icons/comic.svg new file mode 100644 index 0000000..e2f5c9f --- /dev/null +++ b/assets/icons/comic.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/assets/icons/image.svg b/assets/icons/image.svg new file mode 100644 index 0000000..d984b33 --- /dev/null +++ b/assets/icons/image.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/assets/icons/warning.svg b/assets/icons/warning.svg new file mode 100644 index 0000000..8d0a5de --- /dev/null +++ b/assets/icons/warning.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/assets/original.png b/assets/original.png new file mode 100644 index 0000000..7be423e Binary files /dev/null and b/assets/original.png differ diff --git a/assets/original.png~ b/assets/original.png~ new file mode 100644 index 0000000..8946d84 Binary files /dev/null and b/assets/original.png~ differ diff --git a/assets/play-circle.png b/assets/play-circle.png deleted file mode 100644 index af054c7..0000000 Binary files a/assets/play-circle.png and /dev/null differ diff --git a/assets/wallpapers.png b/assets/wallpapers.png new file mode 100644 index 0000000..d598dc0 Binary files /dev/null and b/assets/wallpapers.png differ diff --git a/assets/wallpapers.png~ b/assets/wallpapers.png~ new file mode 100644 index 0000000..714f62d Binary files /dev/null and b/assets/wallpapers.png~ differ diff --git a/config.yaml b/config.yaml index cadca05..37c3b6c 100644 --- a/config.yaml +++ b/config.yaml @@ -212,6 +212,6 @@ languages: socials: - name: 'pixiv' params: - - img: 'pixiv.webp' + - img: 'icons/pixiv.svg' url: 'https://www.pixiv.net/en/users/58118005' weight: 2 diff --git a/content/art/_content.gotmpl b/content/art/_content.gotmpl index 5ebd6ca..d0a6ec1 100644 --- a/content/art/_content.gotmpl +++ b/content/art/_content.gotmpl @@ -30,6 +30,8 @@ {{ $title = . }} {{ end }} + {{ $aspect_ratio := math.Div (index $sizes.full $basename).width (index $sizes.full $basename).height }} + {{ $params := dict "slug" $basename "alt_text" $data.alt_text @@ -55,6 +57,8 @@ "thumb_width" (index $sizes.thumb $basename).width "thumb_height" (index $sizes.thumb $basename).height "filename" $basename + "show_detail_pane" true + "aspect_ratio" $aspect_ratio }} {{ $path := $basename }} diff --git a/content/art/_content.jp.gotmpl b/content/art/_content.jp.gotmpl index 24bea3f..1a7ffc7 100644 --- a/content/art/_content.jp.gotmpl +++ b/content/art/_content.jp.gotmpl @@ -77,6 +77,7 @@ "thumb_width" (index $sizes.thumb $basename).width "thumb_height" (index $sizes.thumb $basename).height "filename" $filename + "show_detail_pane" true }} {{ $langPage := dict diff --git a/content/art/_index.md b/content/art/_index.md index dd5ff3c..460c8c7 100644 --- a/content/art/_index.md +++ b/content/art/_index.md @@ -1,11 +1,10 @@ --- title: "Art" +show_detail_pane: false --- -Welcome to my art gallery! This is the most complete archive of my work online. You might also be interested in [how this gallery works and how I maintain it](/blog/2023/04/breakdown-of-my-static-art-gallery/). +Welcome to my art gallery! This is the most complete archive of my work online. -The gallery is sorted by date, but there's other sections to check out such as [Guest Art](/art/guest) and [Stats](/art/stats/)! You can filter by [tags](/art/tags), or by [characters](/art/characters). +I've been [participating in Artfight](https://artfight.net/~redstrate) since 2023. You can view my attacks and defenses [here](/art/tags/artfight). -I've also been [participating in Artfight](https://artfight.net/~redstrate) since 2023. You can view my attacks and defenses [here](/art/tags/artfight). - -You can follow me on [Mastodon](https://mastodon.art/@redstrate), [Pixiv](https://www.pixiv.net/en/users/58118005), [RSS](/art/index.xml)! The RSS feed is a combination of the "Original" and "Fanart" categories. +You can follow me on [Mastodon](https://mastodon.art/@redstrate), [Pixiv](https://www.pixiv.net/en/users/58118005), or [RSS](/art/index.xml)! diff --git a/content/art/guest/_index.md b/content/art/guest/_index.md index dddfb20..5d8b4e1 100644 --- a/content/art/guest/_index.md +++ b/content/art/guest/_index.md @@ -1,8 +1,7 @@ --- title: "Guest Art" layout: "guestart" +show_detail_pane: false --- -This is a collection of guest artwork made by other artists. The name of the artist is located on the details page of each artwork! - -If you draw one of my characters, it can be featured on this page! If you want me to remove it for any reason (or maybe I forgot to add yours), please [contact me](/contact). +If you draw one of my [characters](/art/characters#original), it can be featured on this page! If you want me to remove it for any reason (or maybe I forgot to add yours), please [contact me](/contact). diff --git a/content/art/nsfw/_index.md b/content/art/nsfw/_index.md deleted file mode 100644 index 24a3e4a..0000000 --- a/content/art/nsfw/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "NSFW Art" -layout: "art-nsfw" ---- - diff --git a/content/art/original/_index.md b/content/art/original/_index.md index f21b278..2e0310e 100644 --- a/content/art/original/_index.md +++ b/content/art/original/_index.md @@ -1,6 +1,7 @@ --- title: "Original Art" layout: "art-originals" +show_detail_pane: false --- -These are artworks I created of my own original characters! +These are artworks I created of [my own original characters](/art/characters#original)! diff --git a/content/art/stats/_index.md b/content/art/stats/_index.md index 307f4a7..7a1de78 100644 --- a/content/art/stats/_index.md +++ b/content/art/stats/_index.md @@ -1,4 +1,5 @@ --- title: "Stats" layout: "art-stats" +show_detail_pane: false --- diff --git a/content/taxonomies/characters.md b/content/taxonomies/characters.md index 5448afd..eb167b6 100644 --- a/content/taxonomies/characters.md +++ b/content/taxonomies/characters.md @@ -5,4 +5,5 @@ layout: listchar listtag: 'characters' skipparent: true trueparent: "/art" +show_detail_pane: false --- diff --git a/data/art/2016/lantern.json b/data/art/2016/lantern.json index 67ccc11..e063a80 100644 --- a/data/art/2016/lantern.json +++ b/data/art/2016/lantern.json @@ -3,7 +3,7 @@ "date": "2016", "nsfw": false, "title": "Lantern", - "tags": ["3D"], + "tags": ["3d"], "camera-orbit": "122.3deg 76deg 12.79m", "type": "3D" } diff --git a/data/art/2016/production-monitor.json b/data/art/2016/production-monitor.json index b276112..4234572 100644 --- a/data/art/2016/production-monitor.json +++ b/data/art/2016/production-monitor.json @@ -3,7 +3,7 @@ "date": "2016", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Cool-looking Monitor" } diff --git a/data/art/2016/sniper-rifle.json b/data/art/2016/sniper-rifle.json index e9fc9a3..ec852ac 100644 --- a/data/art/2016/sniper-rifle.json +++ b/data/art/2016/sniper-rifle.json @@ -3,7 +3,7 @@ "date": "2016", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Sniper Rifle" } diff --git a/data/art/2016/space.json b/data/art/2016/space.json index 15fc422..257b557 100644 --- a/data/art/2016/space.json +++ b/data/art/2016/space.json @@ -3,7 +3,7 @@ "date": "2016", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Spaceship" } diff --git a/data/art/2018/alley.json b/data/art/2018/alley.json index 53324ba..c923d4a 100644 --- a/data/art/2018/alley.json +++ b/data/art/2018/alley.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Alley" } diff --git a/data/art/2018/city-train.json b/data/art/2018/city-train.json index f8e461e..b7fe07e 100644 --- a/data/art/2018/city-train.json +++ b/data/art/2018/city-train.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "City Train" } diff --git a/data/art/2018/glass.json b/data/art/2018/glass.json index c2e8263..2ea67c9 100644 --- a/data/art/2018/glass.json +++ b/data/art/2018/glass.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Glass" } diff --git a/data/art/2018/hallway.json b/data/art/2018/hallway.json index e03c007..f2b0050 100644 --- a/data/art/2018/hallway.json +++ b/data/art/2018/hallway.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Hallway" } diff --git a/data/art/2018/lemon.json b/data/art/2018/lemon.json index fa3030f..d2c9bfd 100644 --- a/data/art/2018/lemon.json +++ b/data/art/2018/lemon.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Lemon" } diff --git a/data/art/2018/room.json b/data/art/2018/room.json index 6f228f8..96a9a13 100644 --- a/data/art/2018/room.json +++ b/data/art/2018/room.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "Classroom" } diff --git a/data/art/2018/tv.json b/data/art/2018/tv.json index f505a8f..756ae91 100644 --- a/data/art/2018/tv.json +++ b/data/art/2018/tv.json @@ -3,7 +3,7 @@ "date": "2018", "program": "Blender", "tags": [ - "3D" + "3d" ], "title": "TV" } diff --git a/data/art/2021/sakura-avatar.json b/data/art/2021/sakura-avatar.json index 74b2fdd..b2d8ced 100644 --- a/data/art/2021/sakura-avatar.json +++ b/data/art/2021/sakura-avatar.json @@ -6,7 +6,7 @@ "date": "2021", "nsfw": false, "title": "Sakura", - "tags": ["3D"], + "tags": ["3d"], "camera-orbit": "44.17deg 89.29deg 2.778m", "camera-target": "0.1m 1.34m 0.14m", "camera-fov": "19.07deg", diff --git a/data/art/2022/planet-express-ship.json b/data/art/2022/planet-express-ship.json index d4c487a..d1a1ff3 100644 --- a/data/art/2022/planet-express-ship.json +++ b/data/art/2022/planet-express-ship.json @@ -4,7 +4,7 @@ "description": "I attempted to make the Planet Express ship!", "nsfw": false, "title": "Planet Express Ship", - "tags": ["3D"], + "tags": ["3d", "fan art" ], "camera-orbit": "62.37deg 81.2deg 37.12m", "camera-target": "0.94m 0.32m 0m", "camera-fov": "19.58deg", diff --git a/data/art/2023/acrocatabro.json b/data/art/2023/acrocatabro.json index 3f2c6a2..817ba69 100644 --- a/data/art/2023/acrocatabro.json +++ b/data/art/2023/acrocatabro.json @@ -6,7 +6,8 @@ "newgrounds_url": "https://www.newgrounds.com/art/view/redstrate/acrocatabro-equest", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "Acro's request" } diff --git a/data/art/2023/aks.json b/data/art/2023/aks.json index 13f04fa..adc0439 100644 --- a/data/art/2023/aks.json +++ b/data/art/2023/aks.json @@ -5,7 +5,8 @@ "mastodon_url": "https://mastodon.art/@redstrate/111014706460965728", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "Aks' request" } diff --git a/data/art/2023/emily.json b/data/art/2023/emily.json index 056afd0..23f0e1d 100644 --- a/data/art/2023/emily.json +++ b/data/art/2023/emily.json @@ -5,7 +5,8 @@ "mastodon_url": "https://mastodon.art/@redstrate/111041558452790638", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "Emily Vasquez's request" } diff --git a/data/art/2023/exiledking.json b/data/art/2023/exiledking.json index dde93fe..cb54a12 100644 --- a/data/art/2023/exiledking.json +++ b/data/art/2023/exiledking.json @@ -5,7 +5,8 @@ "mastodon_url": "https://mastodon.art/@redstrate/111008636606551962", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "ExiledKing's request" } diff --git a/data/art/2023/katie.json b/data/art/2023/katie.json index 7ec5f77..db94bb7 100644 --- a/data/art/2023/katie.json +++ b/data/art/2023/katie.json @@ -7,5 +7,6 @@ "description": "Fan art of Bourbon's character :-)", "mastodon_url": "https://mastodon.art/@redstrate/110606818674511646", "program": "Krita", + "tags": ["fan art"], "title": "katie" } diff --git a/data/art/2023/misnina.json b/data/art/2023/misnina.json index 70b6734..359ea26 100644 --- a/data/art/2023/misnina.json +++ b/data/art/2023/misnina.json @@ -5,7 +5,8 @@ "mastodon_url": "https://mastodon.art/@redstrate/111008641889958920", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "Nina's request" } diff --git a/data/art/2023/neuroknives.json b/data/art/2023/neuroknives.json index 6257a42..45d5fcb 100644 --- a/data/art/2023/neuroknives.json +++ b/data/art/2023/neuroknives.json @@ -5,7 +5,8 @@ "mastodon_url": "https://mastodon.art/@redstrate/111019455071425893", "program": "Krita", "tags": [ - "request" + "request", + "fan art" ], "title": "neuroknives' request" } diff --git a/data/art/2023/nov23sketches.json b/data/art/2023/nov23sketches.json index d0d4b90..fe63dec 100644 --- a/data/art/2023/nov23sketches.json +++ b/data/art/2023/nov23sketches.json @@ -13,7 +13,8 @@ "program": "Drawpile", "tags": [ "sketch", - "drawpile" + "drawpile", + "fan art" ], "title": "November 2023 Sketches" } diff --git a/data/art/2024/balloonshroom.json b/data/art/2024/balloonshroom.json index 5cab754..3f569c9 100644 --- a/data/art/2024/balloonshroom.json +++ b/data/art/2024/balloonshroom.json @@ -4,5 +4,6 @@ "mastodon_url": "https://mastodon.art/@redstrate/111958219719666913", "newgrounds_url": "https://www.newgrounds.com/art/view/redstrate/oc-plaza-1", "program": "Krita", + "tags": ["fan art"], "title": "OC Plaza for Balloonshroom" } diff --git a/data/art/2024/bart-incoming.json b/data/art/2024/bart-incoming.json index d4455f1..0e23f9d 100644 --- a/data/art/2024/bart-incoming.json +++ b/data/art/2024/bart-incoming.json @@ -2,7 +2,7 @@ "alt_text": "A simple 3D animation of BART, a worm (slowly) approaching to your current location. Watch out!", "date": "2024-07-21", "title": "BART INCOMING", - "tags": ["Animation", "Artfight"], + "tags": ["Animation", "Artfight", "fan art", "3d"], "characters": ["Bart"], "description": "Artfight attack: https://artfight.net/attack/8002019.bart-incoming", "type": "Animation" diff --git a/data/art/2024/calamancyy.json b/data/art/2024/calamancyy.json index 083399d..0e3cfd8 100644 --- a/data/art/2024/calamancyy.json +++ b/data/art/2024/calamancyy.json @@ -4,5 +4,6 @@ "mastodon_url": "https://mastodon.art/@redstrate/111958219719666913", "newgrounds_url": "https://www.newgrounds.com/art/view/redstrate/oc-plaza-1", "program": "Krita", + "tags": ["fan art"], "title": "OC Plaza for Calamancyy" } diff --git a/data/art/2024/feathers.json b/data/art/2024/feathers.json index cc42745..674c52b 100644 --- a/data/art/2024/feathers.json +++ b/data/art/2024/feathers.json @@ -8,7 +8,7 @@ "newgrounds_url": "https://www.newgrounds.com/art/view/redstrate/he-s-back", "program": "Krita", "tags": [ - "Fan Art" + "fan art" ], "title": "he's back..." } diff --git a/data/art/2024/idcheck.json b/data/art/2024/idcheck.json index 24b8910..18c2636 100644 --- a/data/art/2024/idcheck.json +++ b/data/art/2024/idcheck.json @@ -10,7 +10,7 @@ "pixiv_url": "https://www.pixiv.net/en/artworks/118886586", "program": "Krita", "tags": [ - "Fan Art" + "fan art" ], "title": "Viera ID Check", "languages": { diff --git a/data/art/2024/konqi.json b/data/art/2024/konqi.json index 1a88c85..10c0afd 100644 --- a/data/art/2024/konqi.json +++ b/data/art/2024/konqi.json @@ -8,7 +8,7 @@ "mastodon_url": "https://mastodon.art/@redstrate/112238971210645004", "program": "Krita", "tags": [ - "Fan Art" + "fan art" ], "title": "Konqi ๐Ÿ“€" } diff --git a/data/art/2024/l3ny.json b/data/art/2024/l3ny.json index 537ad84..f94e87e 100644 --- a/data/art/2024/l3ny.json +++ b/data/art/2024/l3ny.json @@ -4,5 +4,6 @@ "mastodon_url": "https://mastodon.art/@redstrate/111958219719666913", "newgrounds_url": "https://www.newgrounds.com/art/view/redstrate/oc-plaza-1", "program": "Krita", + "tags": ["fan art"], "title": "OC Plaza for L3ny" } diff --git a/data/art/2024/senzaki.json b/data/art/2024/senzaki.json index 3f24440..b20f450 100644 --- a/data/art/2024/senzaki.json +++ b/data/art/2024/senzaki.json @@ -7,7 +7,7 @@ "pixiv_url": "https://www.pixiv.net/en/artworks/119356674", "program": "Krita", "tags": [ - "Fan Art" + "fan art" ], "title": "Senzaki", "languages": { diff --git a/data/recent-changes.json b/data/recent-changes.json index 094ed29..5f56f84 100644 --- a/data/recent-changes.json +++ b/data/recent-changes.json @@ -1,5 +1,6 @@ { "changes": [ + "2024-10-17: Overhauled the gallery again.", "2024-05-19: Fixed the broken art RSS feed, again!", "2024-02-19: Further site improvements, started a FFXIV shrine.", "2024-01-27: Added new artwork!", diff --git a/themes/red/assets/css/site.css b/themes/red/assets/css/site.css index 8acfdd5..c8dbec2 100644 --- a/themes/red/assets/css/site.css +++ b/themes/red/assets/css/site.css @@ -21,7 +21,6 @@ #content { display: flex; flex-direction: row; - align-items: flex-start; } body { @@ -38,6 +37,10 @@ width: calc(33.33% - 7.5px); } + .grid-item-wide { + width: calc(66.667% - 7.5px); + } + .page-pic { float: right; margin-bottom: 10px; @@ -61,10 +64,24 @@ } } +@media (min-width: 1100px) { + #detail-pane { + display: block !important; + } + + #art-detail-inline { + display: none; + } +} + .gutter-sizer { width: 10px; } +#detail-pane { + display: none; +} + /* mobile devices */ @media (max-width: 768px) { aside div { @@ -401,7 +418,7 @@ figure figcaption { padding-bottom: 5px; } -.grid-item img { +.grid-item > picture > img { border-bottom: 1px solid var(--border-color); } @@ -528,11 +545,7 @@ pre { .nice-list li { display: inline-block; -} - -.nice-list li:not(:last-child) { - margin-left: 0; - margin-right: 0; + margin-right: 5px; } .toot-header .toot-profile img { @@ -572,6 +585,7 @@ pre { .nice-list li:not(:last-child):not(:only-child)::after { content: "ยท"; + margin-left: 5px; } #about-pic { @@ -704,11 +718,30 @@ model-viewer { .page-item { display: inline-block; - border: 1px solid gray; - border-radius: 2px; padding: 5px; } +.active { + background-color: var(--background-tertiary); + border-radius: 2px; +} + +.disabled { + background-color: var(--background-tertiary); + border-radius: 2px; +} + +.page-item:not(.disabled):not(.active) { + background-color: var(--extra-color); + border: 1px solid gray; + border-radius: 2px; + + a { + color: var(--text-color); + text-decoration: none; + } +} + .pagination { text-align: center; padding-left: 0; @@ -739,3 +772,60 @@ model-viewer { margin-left: 5px; margin-top: 2px; } + +.pagination > .page-item { + margin-left: 5px; +} + +.pagination > .page-item:nth-child(-n+1) { + float: left; +} + +.pagination > .page-item:nth-last-child(-n+1) { + float: right; +} + +.art-fancy-button { + margin: 5px; + border: 1px solid var(--border-color); + border-radius: 5px; + display: inline-grid; + text-decoration: none; + background-color: var(--background-tertiary); + box-shadow: var(--shadow); + + p { + margin: 0; + color: var(--text-color); + padding: 5px; + } + + img { + border: 1px solid var(--border-color); + } +} + +.art-sidebar-button { + display: block; + width: 240px; + height: 50px; + line-height: 50px; + text-align: center; + border: 1px outset black; + border-radius: 5px; + background-color: var(--extra-color); + text-decoration: none; + color: var(--text-color) !important; + margin-bottom: 10px; +} + +#art-button-main-container { + display: grid; + justify-items: center; +} + +@media (min-width: 1200px) { + #art-button-main-container { + grid-template-columns: 50% 50%; + } +} diff --git a/themes/red/assets/js/gallery.js b/themes/red/assets/js/gallery.js index 99bfdfe..a179946 100644 --- a/themes/red/assets/js/gallery.js +++ b/themes/red/assets/js/gallery.js @@ -1,7 +1,4 @@ imagesLoaded(document.querySelector('.grid'), function(instance) { - const typeIcons = document.querySelectorAll('.gallery-type-icon-hidden'); - typeIcons.forEach(element => element.classList.remove('gallery-type-icon-hidden')); - new Masonry('.grid', { itemSelector: '.grid-item', columnWidth: '.grid-sizer', diff --git a/themes/red/layouts/_default/art-detail.html b/themes/red/layouts/_default/art-detail.html index af14b26..f666b8d 100644 --- a/themes/red/layouts/_default/art-detail.html +++ b/themes/red/layouts/_default/art-detail.html @@ -8,7 +8,6 @@ {{ $.Date.Format "January 2006" }} -
{{ if (and (not $.Params.animation) (and (not (in .File.Dir "art/guest")) (and (not $.Params.threed) (not $.Params.comic) )) ) }} {{ $full := printf "%s/art/%s.avif" $.Site.Params.image_host $.Params.filename }} @@ -56,6 +55,9 @@ {{ partial "voting" . }} +
+ {{ partial "art-detail" . }} + {{ with .Content }} {{ $.Scratch.Set "header-type" "h3" }} {{ $.Scratch.Set "header-name" "Commentary" }} @@ -63,6 +65,7 @@ {{ . }} {{ end }} +
{{ if .Params.threed }} {{ $site := resources.Get "js/model-viewer.min.js" }} @@ -76,58 +79,9 @@ {{ end }} {{ define "details" }} - This artwork was also posted on: + {{ partial "art-sidebar" . }} -
+
- {{ with .Params.mastodon_url }} - Mastodon icon - {{ end }} - - {{ with .Params.pixiv_url }} - Pixiv icon - {{ end }} -
- - Created with: -
- - {{ with .Params.program }} - {{ . }} - {{ end }} - - - {{ with .Params.arttags }} - - - - - {{ end }} - - {{ with .Params.characters }} - - - - - {{ end }} - - {{ with .Params.artist }} - - - - - {{ end }} -
{{ i18n "tags" }} - {{ $len := (len .) }} - {{ range $index, $element := . }} - {{ strings.Title $element }}{{ if not (eq (add $index 1) $len) }},{{ end }} - {{ end }} -
{{ i18n "characters" }} - {{ $len := (len .) }} - {{ range $index, $element := . }} - {{ $element }}{{ if not (eq (add $index 1) $len) }},{{ end }} - {{ end }} -
Artist - {{ . }} -
+ {{ partial "art-detail" . }} {{ end }} diff --git a/themes/red/layouts/_default/art-originals.html b/themes/red/layouts/_default/art-originals.html index 6121f07..a50813d 100644 --- a/themes/red/layouts/_default/art-originals.html +++ b/themes/red/layouts/_default/art-originals.html @@ -7,16 +7,20 @@ {{ .Content }} - {{ $tags := slice "fan art" "artfight" }} + {{ $tags := slice "fan art" "artfight" "3d" }} {{ $art := .Site.GetPage "/art" }} {{ $artworks := (where $art.RegularPagesRecursive "Type" "art") }} {{ $fan_art := (where $artworks "Params.arttags" "intersect" $tags) }} {{ $guest_art := (where $artworks "Params.guest" "=" true) }} - {{ $nsfw_art := (where $artworks "Params.nsfw" "=" true) }} - {{ $originals := complement $fan_art $guest_art $nsfw_art $artworks }} + {{ $originals := complement $fan_art $guest_art $artworks }} {{ $.Scratch.Set "paginator" (.Paginate $originals) }} {{ partial "art-gallery" . }} {{ partial "gallery-js" . }} {{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} +{{ end }} + diff --git a/themes/red/layouts/_default/art-stats.html b/themes/red/layouts/_default/art-stats.html index 0f8f156..520f188 100644 --- a/themes/red/layouts/_default/art-stats.html +++ b/themes/red/layouts/_default/art-stats.html @@ -31,3 +31,7 @@ {{ end }} {{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} +{{ end }} diff --git a/themes/red/layouts/_default/art.html b/themes/red/layouts/_default/art.html index 232be1a..86a2f7e 100644 --- a/themes/red/layouts/_default/art.html +++ b/themes/red/layouts/_default/art.html @@ -2,16 +2,10 @@ {{ define "main" }}

{{ .Title }}

-
- {{ $alertimg := resources.Get "alert.png" }} - {{ with $.Params.new_banner }} -
{{ . }}
- {{ end }} - {{ .Content }}
@@ -20,19 +14,56 @@ {{ end }}
-
- Statistics - Commission Info +
+ {{ with $.Site.GetPage "/art/original" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "original.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/arttags/fan-art" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "fanart.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/arttags/3d" }} + {{ .Scratch.Set "title" "3D Art" }} + {{ .Scratch.Set "img" "3d.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/art/guest" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "guest.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/art/wallpapers" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "wallpapers.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }} + + {{ with $.Site.GetPage "/characters" }} + {{ .Scratch.Set "title" .Title }} + {{ .Scratch.Set "img" "characters.png" }} + {{ .Scratch.Set "link" .RelPermalink }} + {{ partial "art-fancy-button" . }} + {{ end }}
- - Original
- Fanart
- NSFW
- Guest
- Wallpapers
- Characters - - {{ partial "art-years" . }} - - {{ partial "gallery-js" . }} +{{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} + +

Tags

+ {{ range $name, $taxonomy := (index .Site.Taxonomies "arttags") }} + {{ $taxonomy.Page.Title }}
+ {{ end }} {{ end }} diff --git a/themes/red/layouts/_default/arttag.html b/themes/red/layouts/_default/arttag.html index 0586a26..57afe73 100644 --- a/themes/red/layouts/_default/arttag.html +++ b/themes/red/layouts/_default/arttag.html @@ -1,12 +1,13 @@ {{ define "main" }}

{{ .Title }}

-
- {{ $tags := slice "fan art" "artfight" }} {{ $artworks := (where .Pages "Type" "art") }} - {{ $nsfw_art := (where $artworks "Params.nsfw" "=" true) }} - {{ $.Scratch.Set "paginator" (.Paginate (complement $nsfw_art $artworks)) }} + {{ $.Scratch.Set "paginator" (.Paginate $artworks) }} {{ partial "art-gallery" . }} {{ partial "gallery-js" . }} {{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} +{{ end }} diff --git a/themes/red/layouts/_default/baseof.html b/themes/red/layouts/_default/baseof.html index 9c164d1..18dedc3 100644 --- a/themes/red/layouts/_default/baseof.html +++ b/themes/red/layouts/_default/baseof.html @@ -11,7 +11,9 @@
{{- block "main" . }}{{- end }} - + {{ if .Params.show_detail_pane }} + + {{ end }} diff --git a/themes/red/layouts/_default/character.html b/themes/red/layouts/_default/character.html index 2ce6cd9..aa49556 100644 --- a/themes/red/layouts/_default/character.html +++ b/themes/red/layouts/_default/character.html @@ -2,31 +2,25 @@

{{ .Title }}

+ Drawing of a catgirl, with blonde hair and dark eyes. + {{ $has_age := .Params.age }} {{ $has_pronouns := .Params.pronouns }} {{ $has_origin := .Params.origin }} {{ if or $has_origin (or $has_age $has_pronouns) }} - {{ if $has_age }} - - - - +

Age

+

{{ .Params.age }}

{{ end }} {{ if $has_pronouns }} - - - - +

Pronouns

+

{{ .Params.pronouns }}

{{ end }} {{ if $has_origin }} - - - - +

Origin

+

{{ .Params.origin }}

{{ end }} -
Age{{ .Params.age }}
Pronouns{{ .Params.pronouns }}
Origin{{ .Params.origin }}
{{ end }} {{ $tags := slice "fan art" "artfight" }} diff --git a/themes/red/layouts/_default/guestart.html b/themes/red/layouts/_default/guestart.html index a8507f0..58161dc 100644 --- a/themes/red/layouts/_default/guestart.html +++ b/themes/red/layouts/_default/guestart.html @@ -4,14 +4,16 @@

{{ .Title }}

- {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }} + {{ .Content }} - {{ if eq $paginator.PageNumber 1}} - {{ .Content }} - {{ end }} + {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }} {{ $.Scratch.Set "paginator" (.Paginate ((where (where .RegularPagesRecursive "Type" "art") "Params.guest" "=" true))) }} {{ partial "art-gallery" . }} {{ partial "gallery-js" . }} {{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} +{{ end }} diff --git a/themes/red/layouts/_default/listchar.html b/themes/red/layouts/_default/listchar.html index 633986e..cdd71dd 100644 --- a/themes/red/layouts/_default/listchar.html +++ b/themes/red/layouts/_default/listchar.html @@ -6,7 +6,7 @@

Original

-
+
{{ range $name, $taxonomy := (index .Site.Taxonomies .Params.listtag) }} {{ $original := false }} @@ -20,17 +20,28 @@ {{ end }}
-

Others

-
- {{ range $name, $taxonomy := (index .Site.Taxonomies .Params.listtag) }} - {{ $original := false }} - {{ if $taxonomy.Page.Params.original }} - {{ $original = $taxonomy.Page.Params.original }} - {{ end }} +
- {{ if not $original }} - {{ $taxonomy.Page.Title }} +
+ + Others + +
+ {{ range $name, $taxonomy := (index .Site.Taxonomies .Params.listtag) }} + {{ $original := false }} + {{ if $taxonomy.Page.Params.original }} + {{ $original = $taxonomy.Page.Params.original }} + {{ end }} + + {{ if not $original }} + {{ $taxonomy.Page.Title }} + {{ end }} {{ end }} - {{ end }} -
+
+ {{ end }} + +{{ define "details" }} + {{ partial "art-sidebar" . }} +{{ end }} + diff --git a/themes/red/layouts/partials/art-detail.html b/themes/red/layouts/partials/art-detail.html new file mode 100644 index 0000000..992cd61 --- /dev/null +++ b/themes/red/layouts/partials/art-detail.html @@ -0,0 +1,41 @@ +{{ with .Params.artist }} +

Artist

+ {{ . }} +{{ end }} + +{{ with .Params.arttags }} +

{{ i18n "tags" }}

+ {{ $len := (len .) }} + {{ range $index, $element := . }} + {{ strings.Title $element }}{{ if not (eq (add $index 1) $len) }},{{ end }} + {{ end }} +{{ end }} + +{{ if or .Params.mastodon_url .Params.pixiv_url }} +

Also available on

+ +
+ {{ with .Params.mastodon_url }} + Mastodon icon + {{ end }} + + {{ with .Params.pixiv_url }} + Pixiv icon + {{ end }} +
+{{ end }} + +{{ with .Params.program }} +

Created with

+ {{ . }} +{{ end }} + +{{ with .Params.characters }} +

Characters

+ {{ range . }} + {{ with $.Site.GetPage "taxonomyTerm" (printf "characters/%s" .) }} + {{ $year := .Page.Title }} + {{ $year }}
 + {{ end }} + {{ end }} +{{ end }} diff --git a/themes/red/layouts/partials/art-fancy-button.html b/themes/red/layouts/partials/art-fancy-button.html new file mode 100644 index 0000000..68346f0 --- /dev/null +++ b/themes/red/layouts/partials/art-fancy-button.html @@ -0,0 +1,12 @@ +{{ $img := .Scratch.Get "img" }} +{{ $title := .Scratch.Get "title" }} +{{ $link := .Scratch.Get "link" }} + +{{ with resources.Get $img }} + +

{{ $title }}

+ + +{{ else }} + Could not find {{ $img }}! +{{ end }} diff --git a/themes/red/layouts/partials/art-gallery.html b/themes/red/layouts/partials/art-gallery.html index 853efa7..64d8e84 100644 --- a/themes/red/layouts/partials/art-gallery.html +++ b/themes/red/layouts/partials/art-gallery.html @@ -1,6 +1,5 @@ {{/* Partial used to display a grid of artwork. */}} -{{ template "_internal/pagination.html" . }} {{ $paginator := .Scratch.Get "paginator" }}
@@ -14,4 +13,4 @@
-{{ template "_internal/pagination.html" . }} +{{ partial "art-pagination" . }} diff --git a/themes/red/layouts/partials/art-pagination.html b/themes/red/layouts/partials/art-pagination.html new file mode 100644 index 0000000..6b8f3f9 --- /dev/null +++ b/themes/red/layouts/partials/art-pagination.html @@ -0,0 +1,46 @@ +{{- $page := . }} + + diff --git a/themes/red/layouts/partials/art-sidebar.html b/themes/red/layouts/partials/art-sidebar.html new file mode 100644 index 0000000..769f83a --- /dev/null +++ b/themes/red/layouts/partials/art-sidebar.html @@ -0,0 +1,2 @@ +Statistics +Commission Info diff --git a/themes/red/layouts/partials/head.html b/themes/red/layouts/partials/head.html index 61613a9..243e38b 100644 --- a/themes/red/layouts/partials/head.html +++ b/themes/red/layouts/partials/head.html @@ -30,5 +30,10 @@ + {{ if .Params.nsfw }} + + + {{ end }} + {{ partial "opengraph.html" . }} diff --git a/themes/red/layouts/partials/render-art.html b/themes/red/layouts/partials/render-art.html index f9ff583..ada5191 100644 --- a/themes/red/layouts/partials/render-art.html +++ b/themes/red/layouts/partials/render-art.html @@ -3,6 +3,11 @@ {{ $full := printf "%s/thumb/%s.avif" $.Site.Params.image_host .Params.filename }} {{ $jpeg := printf "%s/thumb/%s.jpg" $.Site.Params.image_host .Params.filename }} +{{ $grid_class := "grid-item" }} +{{ if ge $.Params.aspect_ratio 1 }} + {{ $grid_class = "grid-item-wide" }} +{{ end }} + {{ $title := .Title }} @@ -18,21 +23,30 @@ {{ $title }}, {{ $year }} {{ if $.Params.threed }} - {{ with resources.Get "3d.png" }} - 3D cube icon + {{ with resources.Get "icons/3d.svg" }} + 3D cube icon + {{ end }} + {{ else }} + {{ if $.Params.comic }} + {{ with resources.Get "icons/comic.svg" }} + Comic icon + {{ end }} + {{ else }} + {{ if $.Params.animation }} + {{ with resources.Get "icons/animation.svg" }} + Play animation icon + {{ end }} + {{ else }} + {{ with resources.Get "icons/image.svg" }} + Image icon + {{ end }} + {{ end }} {{ end }} {{ end }} - {{ if $.Params.comic }} - {{ with resources.Get "comic.png" }} - Comic icon - {{ end }} - {{ end }} - - - {{ if $.Params.animation }} - {{ with resources.Get "play-circle.png" }} - Play animation icon + {{ if $.Params.nsfw }} + {{ with resources.Get "icons/warning.svg" }} + Adult content icon {{ end }} {{ end }}