From 720856bb353ab66a773e0a438d8af7f0a2188641 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Sun, 12 Apr 2026 17:41:11 +1000 Subject: v0.8a --- Pages/Component/ButtonContainer.razor.css | 6 +++ Pages/ViewMedia.razor | 44 ++++++++++++++++----- Pages/ViewMedia.razor.css | 14 +++---- Pages/_Host.cshtml | 2 +- Server.csproj | 4 +- wwwroot/images/book.svg | 7 ++++ wwwroot/images/checkmark.svg | 7 ++++ wwwroot/images/cross.svg | 7 ++++ wwwroot/images/edit.svg | 7 ++++ wwwroot/images/info.svg | 63 +++++++++++++++++++++++++++++++ wwwroot/images/photo.svg | 7 ++++ wwwroot/images/tag.svg | 7 ++++ wwwroot/images/trash.svg | 7 ++++ wwwroot/styles/global.css | 27 +++++++++++++ 14 files changed, 188 insertions(+), 21 deletions(-) create mode 100644 wwwroot/images/book.svg create mode 100644 wwwroot/images/checkmark.svg create mode 100644 wwwroot/images/cross.svg create mode 100644 wwwroot/images/edit.svg create mode 100644 wwwroot/images/info.svg create mode 100644 wwwroot/images/photo.svg create mode 100644 wwwroot/images/tag.svg create mode 100644 wwwroot/images/trash.svg diff --git a/Pages/Component/ButtonContainer.razor.css b/Pages/Component/ButtonContainer.razor.css index 6de94c7..c2d5d25 100644 --- a/Pages/Component/ButtonContainer.razor.css +++ b/Pages/Component/ButtonContainer.razor.css @@ -2,3 +2,9 @@ display: flex; justify-content: flex-end; } + +@media (hover: none) and (pointer: coarse) { + div { + justify-content: center; + } +} diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor index c6ff2ce..27a366c 100644 --- a/Pages/ViewMedia.razor +++ b/Pages/ViewMedia.razor @@ -100,27 +100,51 @@
- - - + + + @if(infoEditMode) { - - + + } else { - + } @if(media.IsIngest) { - + } else { - + }
- 🖼 - 🛈 + +
diff --git a/Pages/ViewMedia.razor.css b/Pages/ViewMedia.razor.css index d5bac3e..080994a 100644 --- a/Pages/ViewMedia.razor.css +++ b/Pages/ViewMedia.razor.css @@ -20,6 +20,7 @@ div#image-container { box-sizing: border-box; flex: 1 0 0; height: 100%; + overflow: auto; padding: var(--size-default-gap); width: 100%; } @@ -210,16 +211,13 @@ div#bottom-bar { } } -div#bottom-bar > a { - color: white; - display: block; - font-size: 18pt; - margin: auto; - padding: 7px; - user-select: none; +div#bottom-bar > img { + color: white; + margin: auto; + padding: 10px; } -div#bottom-bar > a:active { +div#bottom-bar > img:active { /* TODO: Use colours from global.css */ background: white; color: #141414; diff --git a/Pages/_Host.cshtml b/Pages/_Host.cshtml index abee742..28ff24c 100644 --- a/Pages/_Host.cshtml +++ b/Pages/_Host.cshtml @@ -7,7 +7,7 @@ - + diff --git a/Server.csproj b/Server.csproj index a1ab5b8..494ff00 100644 --- a/Server.csproj +++ b/Server.csproj @@ -6,9 +6,9 @@ enable HyperBooru HyperBooru - 0.7.0.0 + 0.8.0.0 $(AssemblyVersion) - 0.7-alpha + 0.8-alpha 2907567f-4640-4581-8f4d-0977952d26bd diff --git a/wwwroot/images/book.svg b/wwwroot/images/book.svg new file mode 100644 index 0000000..6cdfc79 --- /dev/null +++ b/wwwroot/images/book.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/wwwroot/images/checkmark.svg b/wwwroot/images/checkmark.svg new file mode 100644 index 0000000..5e55d9e --- /dev/null +++ b/wwwroot/images/checkmark.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/wwwroot/images/cross.svg b/wwwroot/images/cross.svg new file mode 100644 index 0000000..0c37363 --- /dev/null +++ b/wwwroot/images/cross.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/wwwroot/images/edit.svg b/wwwroot/images/edit.svg new file mode 100644 index 0000000..d4c6ec4 --- /dev/null +++ b/wwwroot/images/edit.svg @@ -0,0 +1,7 @@ + + + + + + alt-square-pencil + \ No newline at end of file diff --git a/wwwroot/images/info.svg b/wwwroot/images/info.svg new file mode 100644 index 0000000..b194f05 --- /dev/null +++ b/wwwroot/images/info.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + diff --git a/wwwroot/images/photo.svg b/wwwroot/images/photo.svg new file mode 100644 index 0000000..486c360 --- /dev/null +++ b/wwwroot/images/photo.svg @@ -0,0 +1,7 @@ + + + + + + image + \ No newline at end of file diff --git a/wwwroot/images/tag.svg b/wwwroot/images/tag.svg new file mode 100644 index 0000000..3eb8843 --- /dev/null +++ b/wwwroot/images/tag.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/wwwroot/images/trash.svg b/wwwroot/images/trash.svg new file mode 100644 index 0000000..18ff9c1 --- /dev/null +++ b/wwwroot/images/trash.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/wwwroot/styles/global.css b/wwwroot/styles/global.css index 726c91a..2bd24bc 100644 --- a/wwwroot/styles/global.css +++ b/wwwroot/styles/global.css @@ -40,8 +40,10 @@ body { display: flex; flex-direction: column; font-family: 'Trebuchet MS', 'Lucida Sans Unicode'; + height: 100dvh; margin: 0; overflow: hidden; + width: 100dvw; } a { @@ -82,12 +84,14 @@ code { } button, input[type=submit] { + align-items: center; background: var(--col-button-pri); border-radius: 10px; border: none; box-sizing: border-box; color: white; cursor: pointer; + display: flex; height: 30px; margin: 10px 5px 0 5px; padding: 0 9px 0 9px; @@ -103,6 +107,29 @@ button.warning { background: var(--col-button-warning); } +button > img { + height: 15px; + margin-right: 5px; + width: 15px; +} + +@media (hover: none) and (pointer: coarse) { + button { + height: auto; + } + + button > :not(:first-child) { + display: none; + } + + button > img { + height: 20px; + margin-right: 0; + padding: 8px; + width: 20px; + } +} + @media (hover: hover) { button.warning:hover { background: var(--col-button-warning-hl); -- cgit v1.3