diff --git a/justfile b/justfile index 207154c..7d3fb8d 100644 --- a/justfile +++ b/justfile @@ -2,12 +2,23 @@ set export set quiet set dotenv-load -build: +#[arg("assets", long="assets")] +build assets="false": #!/usr/bin/env bash mkdir -p ./out rm -rf ./out/* cargo run - cp -r ./public ./out/public + + flags="" + if [ "$assets" == "false" ]; then + flags="$flags--exclude=assets/" + fi + + rsync -r ./public ./out $flags + + if [ -n "$OUTPUT" ]; then + rsync -r ./out/ $OUTPUT + fi test: cargo test diff --git a/public/styles/bbs/melding.css b/public/styles/bbs/melding.css index 21ad32d..8370a1a 100644 --- a/public/styles/bbs/melding.css +++ b/public/styles/bbs/melding.css @@ -1,11 +1,14 @@ table { - th { + thead { position: sticky; top: 0; + } - &.crystal { - top: 3.3vh; - } + th.crystal { + border-top: 0; + border-bottom: var(--table-border); + border-right: var(--table-border); + border-radius: 0; } .charlist { @@ -41,4 +44,4 @@ table { flex: 0 1 100px; } } -} \ No newline at end of file +} diff --git a/public/styles/common/base.css b/public/styles/common/base.css index 2cf25a8..0d7a954 100644 --- a/public/styles/common/base.css +++ b/public/styles/common/base.css @@ -1,4 +1,4 @@ -@import url("./colors.css"); +@import url("./vars.css"); body { position: relative; @@ -26,7 +26,8 @@ table { width: 100%; text-align: center; vertical-align: middle; - border-collapse: collapse; + border-collapse: separate; + border-spacing: 0; margin-top: 10px; thead th { @@ -37,10 +38,33 @@ table { background-color: #4f4f4f; } - & tr, + th { + border-top: var(--table-border); + border-bottom: var(--table-border); + border-right: var(--table-border); + } + + td { + border-bottom: var(--table-border); + border-right: var(--table-border); + } + + th:first-child, + td:first-child { + border-left: var(--table-border); + } + + th:first-child { + border-top-left-radius: var(--table-radius); + } + + th:last-child { + border-top-right-radius: var(--table-radius); + } + + tr, th, td { - border: 1px solid #515151; padding: 7px; } } diff --git a/public/styles/common/colors.css b/public/styles/common/vars.css similarity index 82% rename from public/styles/common/colors.css rename to public/styles/common/vars.css index 961fd1c..c529917 100644 --- a/public/styles/common/colors.css +++ b/public/styles/common/vars.css @@ -16,6 +16,11 @@ --primary-color: #00aa00; --primary-light-color: #60de60; + --border-color: #515151; + --error-color: hsl(2, 68%, 53%); --error-color-lighter: hsl(2, 68%, 63%); + + --table-border: 1px solid var(--border-color); + --table-radius: 10px; } diff --git a/templates/pages/bbs/melding.html b/templates/pages/bbs/melding.html index 54db709..eb8b7b6 100644 --- a/templates/pages/bbs/melding.html +++ b/templates/pages/bbs/melding.html @@ -22,7 +22,7 @@