From 146387c439dee8fef31392103739962196dc03c5 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Sun, 3 Aug 2025 13:36:55 +0200 Subject: [PATCH 1/5] [BUGFIX] styling msg success, error, etc. --- src/page.rs | 12 +++++++++--- static/serve/style.css | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/page.rs b/src/page.rs index 6423262..4147802 100644 --- a/src/page.rs +++ b/src/page.rs @@ -95,26 +95,32 @@ impl Page { main.container { @if let Some(found_camera) = &self.found_camera { - article class="succ w-full" { + div.flex { + article class="succ msg" { header { (t!("found_camera_title", name = found_camera)) } (t!("found_camera_body")) " " a href="#ranking" { "See your ranking" } footer { (found_camera) } } + } } @if self.new_name { - article class="name w-full" { + div.flex { + article class="name msg" { header { "New name!" } "Does it feel much different?" } + } } @if let Some(err) = &self.err { - article class="error w-full" { + div.flex { + article class="error msg" { header { (err.0) } (err.1) footer { (err.2) } } + } } section { (content) } diff --git a/static/serve/style.css b/static/serve/style.css index 364f209..b4d3e79 100644 --- a/static/serve/style.css +++ b/static/serve/style.css @@ -97,10 +97,11 @@ input[type="submit"]:active { flex-wrap: wrap; } -.w-full { +.msg { width: 100%; max-width: 40rem; text-align: center; + margin: auto; } .small { From eac9dd3eadd65a821847b7d9e4068a0a8b8c05d2 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Sun, 3 Aug 2025 13:40:34 +0200 Subject: [PATCH 2/5] [BUGFIX] button jumping on active stated --- static/serve/style.css | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/static/serve/style.css b/static/serve/style.css index b4d3e79..9df0abb 100644 --- a/static/serve/style.css +++ b/static/serve/style.css @@ -36,9 +36,7 @@ h2 { /** Button Styles */ input[type="submit"], button:not([class="secondary"]) { - transition: margin-top 0.3s ease, - margin-left 0.3s ease, - box-shadow 0.3s ease; + transition: box-shadow 0.3s ease; background: var(--pico-primary); border: solid 1px var(--pico-primary-hover-background); @@ -57,13 +55,7 @@ button:not([class="secondary"]) { /* When the button is clicked */ button:not([class="secondary"]):active, input[type="submit"]:active { - transition: margin-top 0.3s ease; - margin-left 0.3s ease; - box-shadow 0.3s ease; - - margin-left:9px; - margin-top:9px; - + transition: box-shadow 0.3s ease; box-shadow: 0px 0px 0px var(--pico-primary-hover-background); } From 8a3fec49d04a2504f2069fb72b97f7f388ff081e Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Sun, 3 Aug 2025 13:56:19 +0200 Subject: [PATCH 3/5] [BUGFIX] color issues --- static/serve/style.css | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/static/serve/style.css b/static/serve/style.css index 9df0abb..a45458b 100644 --- a/static/serve/style.css +++ b/static/serve/style.css @@ -16,6 +16,7 @@ --pico-card-sectioning-background-color: unset; --pico-mark-background-color: yellow !important; --pico-mark-color: black !important; + --custom-box-shadow: #015886; } /** Headline Styles */ @@ -38,18 +39,23 @@ input[type="submit"], button:not([class="secondary"]) { transition: box-shadow 0.3s ease; - background: var(--pico-primary); - border: solid 1px var(--pico-primary-hover-background); + background: var(--pico-primary-background); + border: solid 1px var(--custom-box-shadow); - box-shadow: 1px 0px 0px var(--pico-primary-hover-background),0px 1px 0px var(--pico-primary-hover-background), - 2px 1px 0px var(--pico-primary-hover-background),1px 2px 0px var(--pico-primary-hover-background), - 3px 2px 0px var(--pico-primary-hover-background),2px 3px 0px var(--pico-primary-hover-background), - 4px 3px 0px var(--pico-primary-hover-background),3px 4px 0px var(--pico-primary-hover-background), - 5px 4px 0px var(--pico-primary-hover-background),4px 5px 0px var(--pico-primary-hover-background), - 6px 5px 0px var(--pico-primary-hover-background),5px 6px 0px var(--pico-primary-hover-background), - 7px 6px 0px var(--pico-primary-hover-background),6px 7px 0px var(--pico-primary-hover-background), - 8px 7px 0px var(--pico-primary-hover-background),7px 8px 0px var(--pico-primary-hover-background), - 9px 8px 0px var(--pico-primary-hover-background),8px 9px 0px var(--pico-primary-hover-background); + box-shadow: 1px 0px 0px var(--custom-box-shadow),0px 1px 0px var(--custom-box-shadow), + 2px 1px 0px var(--custom-box-shadow),1px 2px 0px var(--custom-box-shadow), + 3px 2px 0px var(--custom-box-shadow),2px 3px 0px var(--custom-box-shadow), + 4px 3px 0px var(--custom-box-shadow),3px 4px 0px var(--custom-box-shadow), + 5px 4px 0px var(--custom-box-shadow),4px 5px 0px var(--custom-box-shadow), + 6px 5px 0px var(--custom-box-shadow),5px 6px 0px var(--custom-box-shadow), + 7px 6px 0px var(--custom-box-shadow),6px 7px 0px var(--custom-box-shadow), + 8px 7px 0px var(--custom-box-shadow),7px 8px 0px var(--custom-box-shadow), + 9px 8px 0px var(--custom-box-shadow),8px 9px 0px var(--custom-box-shadow); +} + +input[type="submit"]:focus, +button:not([class="secondary"]):focus { + outline: 3px solid yellow; } /* When the button is clicked */ From 469d6d221084304bb4e2925536f3265151cbe5ce Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Sun, 3 Aug 2025 14:00:17 +0200 Subject: [PATCH 4/5] [TASK] rm home icon and link in header --- locales/de.yml | 1 - locales/en.yml | 1 - src/page.rs | 5 ----- 3 files changed, 7 deletions(-) diff --git a/locales/de.yml b/locales/de.yml index 14e9ef0..f5bfc63 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -1,6 +1,5 @@ _version: 1 digital_shadows: "Digitaler Schatten" -icon_home: "🏠" icon_camera: "📸" found_camera_title: "Kamera '%{name}' gefunden" found_camera_body: "✨ You are a star ✨ Star dust sprinkle, sprinkle." diff --git a/locales/en.yml b/locales/en.yml index 09fa542..a4abc91 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -1,6 +1,5 @@ _version: 1 digital_shadows: "Digital Shadows" -icon_home: "🏠" icon_camera: "📸" found_camera_title: "Camera '%{name}' found" found_camera_body: "✨ You are a star ✨ Star dust sprinkle, sprinkle." diff --git a/src/page.rs b/src/page.rs index 4147802..86246b8 100644 --- a/src/page.rs +++ b/src/page.rs @@ -70,11 +70,6 @@ impl Page { } } ul { - li { - a href="/" { - span role="img" aria-label="home" { (t!("icon_home")) } - } - } li { a href="/game" { span role="img" aria-label="camera" { (t!("icon_camera")) } From 027ab8d9eb8b9a96ff4ec8da8a2f61e4a42dce75 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Sun, 3 Aug 2025 14:03:35 +0200 Subject: [PATCH 5/5] [TASK] reset muted color to pico standard color --- static/serve/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/serve/style.css b/static/serve/style.css index a45458b..e692470 100644 --- a/static/serve/style.css +++ b/static/serve/style.css @@ -30,6 +30,10 @@ h1 { text-align: center; } +hgroup>:not(:first-child):last-child { + --pico-color: var(--pico-color); +} + h2 { --pico-typography-spacing-top: 4rem; }