From d78a61b8fcd5cf77ede679ceb8828afc9bf1ba59 Mon Sep 17 00:00:00 2001 From: Kevin McConnell Date: Thu, 5 Jun 2025 14:55:02 +0100 Subject: [PATCH 1/5] Use `vfs` tag on production accessories --- config/deploy.production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.production.yml b/config/deploy.production.yml index 3f2102f95..e949617b2 100644 --- a/config/deploy.production.yml +++ b/config/deploy.production.yml @@ -21,7 +21,7 @@ env: RAILS_ENV: production x-beamer-accessory: &beamer-accessory - image: basecamp/beamer + image: basecamp/beamer:vfs registry: username: bcbot password: From 35b8b6f470b48628e64c46fefc8bc5d1721cce74 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 5 Jun 2025 17:03:21 +0200 Subject: [PATCH 2/5] Fix: update option when changing index --- app/javascript/controllers/knob_controller.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/javascript/controllers/knob_controller.js b/app/javascript/controllers/knob_controller.js index 0ca225750..66b3e0d56 100644 --- a/app/javascript/controllers/knob_controller.js +++ b/app/javascript/controllers/knob_controller.js @@ -18,6 +18,7 @@ export default class extends Controller { set #index(index) { this.fieldTarget.style.setProperty("--knob-index", `${index}`); this.sliderTarget.value = index + this.#optionForIndex(index).checked = true } get #selectedOption() { @@ -26,10 +27,6 @@ export default class extends Controller { }) } - set #value(index) { - this.#optionForIndex(index).checked = true - } - #optionForIndex(index) { return this.optionTargets.find(option => { return option.dataset.index === index; From 33e9a6e645e4276405aab152196c978aad9d5fb0 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 5 Jun 2025 08:45:11 -0500 Subject: [PATCH 3/5] Cap height and scroll list --- app/views/accounts/settings/_users.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/accounts/settings/_users.html.erb b/app/views/accounts/settings/_users.html.erb index cf8db2ff4..bac38408a 100644 --- a/app/views/accounts/settings/_users.html.erb +++ b/app/views/accounts/settings/_users.html.erb @@ -1,7 +1,8 @@
People on the account <%= render "accounts/invite" %> -
+ +
<%= render partial: "accounts/user", collection: users %>
From a22a78e60a93ba39d0b89aa5b15fe31f6d9119a6 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 5 Jun 2025 11:16:53 -0500 Subject: [PATCH 4/5] Use card header in events --- app/assets/stylesheets/events.css | 44 ++++++++++++++----------- app/views/events/event/_layout.html.erb | 33 ++++++++++++------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index a0a5385f9..31207886f 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -131,16 +131,23 @@ --column-gap: 0.7ch; --panel-border-color: transparent; --panel-border-radius: 0.2em; - --panel-padding: 0.6em 1.2em 0.6em 0.6em; + --panel-padding: 0.6em; --panel-size: auto; margin: var(--inline-space); + overflow: clip; position: relative; - /* z-index: 1; */ @media (max-width: 639px) { --panel-size: 100%; } + + .card__collection { + border-end-end-radius: 0.3em; + font-size: var(--text-xx-small); + margin: -1.2em auto 0.8em -1.2em; + padding-block: 0.6em; + } } .event--golden { @@ -194,6 +201,22 @@ text-transform: uppercase; } + .event__icon { + background-color: var(--card-color); + border-end-start-radius: 0.3em; + display: grid; + font-size: var(--text-xx-small); + margin: -1.2em -1.2em 0.8em auto; + padding: 0.6em 0.9em 0.6em 0.7em; + place-content: center; + + .icon { + block-size: 1.4em; + inline-size: 1.4em; + grid-area: 1 / 1; + } + } + .event__timestamp { align-self: start; display: grid; @@ -207,21 +230,4 @@ font-size: 1.1em; line-height: 1.2; } - - .event__icon { - aspect-ratio: 1; - background-color: var(--card-color); - block-size: 1.7em; - border-radius: 1.7em; - inline-size: 1.7em; - display: grid; - place-content: center; - margin-inline-end: -0.75em; - - .icon { - block-size: 1.1em; - inline-size: 1.1em; - grid-area: 1 / 1; - } - } } diff --git a/app/views/events/event/_layout.html.erb b/app/views/events/event/_layout.html.erb index 7ac860790..0a3fd11f8 100644 --- a/app/views/events/event/_layout.html.erb +++ b/app/views/events/event/_layout.html.erb @@ -1,19 +1,18 @@ <%= link_to event.notifiable_target, - class: "event event--#{ event.action } #{ "event--golden" if event.card.golden? && card.doing? } panel center center-block flex-inline align-start justify-start gap position-relative", + class: "event event--#{ event.action } #{ "event--golden" if event.card.golden? && card.doing? } panel center center-block flex-inline align-start justify-start position-relative", style: "--card-color: #{ card.closed? ? "var(--color-card-complete)" : card.color }; background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-canvas)); color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); border: 1px solid color-mix(in srgb, var(--card-color) 20%, var(--color-canvas))", data: { related_element_target: "related", related_element_group_value: card.id, action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %> -
- <%= avatar_image_tag(event.creator) %> -
- -
-
- - <%= event_action_sentence(event) %> - +
+
+
+ <%= card.id %> + + <%= event.collection.name %> + +
<% if event_column(event) == 2 %> @@ -22,8 +21,18 @@ <% end %>
- <%= yield %> +
+
+ <%= avatar_image_tag(event.creator) %> +
- <%= card.id %> ยท <%= event.collection.name %> +
+ + <%= event_action_sentence(event) %> + + + <%= yield %> +
+
<% end %> From c4aa46a35e8d7889d3ae116e40027037db0c8377 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 5 Jun 2025 11:21:52 -0500 Subject: [PATCH 5/5] Fix that flash notices invisibly overlapped navbar --- app/assets/stylesheets/flash.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/flash.css b/app/assets/stylesheets/flash.css index 8eaddb0aa..e94a1ce80 100644 --- a/app/assets/stylesheets/flash.css +++ b/app/assets/stylesheets/flash.css @@ -1,10 +1,11 @@ @layer components { .flash { display: flex; - inline-size: 100%; - inset: var(--block-space) auto auto auto; + inset-block-start: var(--block-space); + inset-inline-start: 50%; justify-content: center; position: fixed; + transform: translate(-50%); z-index: 6; }