From 7e008864f2200feddfb87dceeb3b06eae44e7bf5 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:04:21 -0600 Subject: [PATCH 1/6] Ensure back buttons collapse to icons on small screens --- app/views/account/join_codes/edit.html.erb | 3 ++- app/views/account/join_codes/show.html.erb | 3 ++- app/views/users/edit.html.erb | 3 ++- app/views/users/email_addresses/new.html.erb | 3 ++- app/views/webhooks/show.html.erb | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb index 44854c6d0..7f22b9318 100644 --- a/app/views/account/join_codes/edit.html.erb +++ b/app/views/account/join_codes/edit.html.erb @@ -2,8 +2,9 @@ <% content_for :header do %>
- <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= link_to account_join_code_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= icon_tag "arrow-left" %> Back to Invite link ← diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb index d16006019..b20d48b98 100644 --- a/app/views/account/join_codes/show.html.erb +++ b/app/views/account/join_codes/show.html.erb @@ -2,8 +2,9 @@ <% content_for :header do %>
- <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= link_to account_settings_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= icon_tag "arrow-left" %> Back to Account Settings ← diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 5ac5e7807..1646c3944 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -2,8 +2,9 @@ <% content_for :header do %>
- <%= link_to user_path(@user), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= link_to user_path(@user), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= icon_tag "arrow-left" %> Back to profile ← diff --git a/app/views/users/email_addresses/new.html.erb b/app/views/users/email_addresses/new.html.erb index 193911672..8b0f1cbcf 100644 --- a/app/views/users/email_addresses/new.html.erb +++ b/app/views/users/email_addresses/new.html.erb @@ -2,8 +2,9 @@ <% content_for :header do %>
- <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= icon_tag "arrow-left" %> Back to My profile ← diff --git a/app/views/webhooks/show.html.erb b/app/views/webhooks/show.html.erb index 4dbef81d3..673df0df3 100644 --- a/app/views/webhooks/show.html.erb +++ b/app/views/webhooks/show.html.erb @@ -2,8 +2,9 @@ <% content_for :header do %>
- <%= link_to board_webhooks_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= link_to board_webhooks_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + <%= icon_tag "arrow-left" %> Back to Webhooks ← From 0259cb860d488e8195d9d0ba6544e5391742fc29 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:16:16 -0600 Subject: [PATCH 2/6] Fix awkward wrapping on mobile --- app/views/account/join_codes/show.html.erb | 2 +- app/views/cards/comments/edit.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb index b20d48b98..e9fd72d71 100644 --- a/app/views/account/join_codes/show.html.erb +++ b/app/views/account/join_codes/show.html.erb @@ -31,7 +31,7 @@ <% end %>
-
+
<%= tag.button class: "btn btn--link", data: { controller: "copy-to-clipboard", action: "copy-to-clipboard#copy", copy_to_clipboard_success_class: "btn--success", copy_to_clipboard_content_value: url } do %> diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb index 5b020de6d..2eafce124 100644 --- a/app/views/cards/comments/edit.html.erb +++ b/app/views/cards/comments/edit.html.erb @@ -11,9 +11,9 @@ <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %> <%= general_prompts(@card.board) %> <% end %> -
+
<%= form.button class: "btn btn--reversed", type: :submit do %> - Save changes + Save <% end %> <%= link_to card_comment_path(@card, @comment), class: "btn", data: { form_target: "cancel" } do %> Cancel From a15043a336a18eeb931c5ce650d871e3faf23586 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:23:21 -0600 Subject: [PATCH 3/6] The symbol is hard to read, go back to text labels --- app/helpers/hotkeys_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/hotkeys_helper.rb b/app/helpers/hotkeys_helper.rb index 3e75081f9..810a0f83e 100644 --- a/app/helpers/hotkeys_helper.rb +++ b/app/helpers/hotkeys_helper.rb @@ -5,7 +5,7 @@ module HotkeysHelper if key == "ctrl" && platform.mac? "⌘" elsif key == "enter" - "⏎" + platform.mac? ? "return" : "enter" elsif key == "shift" "⇧" else From 25e2d98c35ce1b12374a3920bea55ee83361cadb Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:26:55 -0600 Subject: [PATCH 4/6] Don't label these, they're expected and obvious (I think) --- app/views/cards/comments/_new.html.erb | 1 - app/views/cards/container/footer/_draft.html.erb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb index 8d1426f5a..1485867f9 100644 --- a/app/views/cards/comments/_new.html.erb +++ b/app/views/cards/comments/_new.html.erb @@ -18,7 +18,6 @@ <%= form.button class: "comment__submit btn btn--reversed", data: { form_target: "submit" }, disabled: true do %> Post - <%= hotkey_label([ "ctrl", "enter" ]) %> <% end %> <% end %> diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb index dbc95a6da..2516a3e21 100644 --- a/app/views/cards/container/footer/_draft.html.erb +++ b/app/views/cards/container/footer/_draft.html.erb @@ -3,7 +3,6 @@ form: { data: { controller: "form" } }, data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+enter@document->clicker#click keydown.meta+enter@document->clicker#click" } do %> Create card - <%= hotkey_label([ "ctrl", "enter" ]) %> <% end %> <%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another", From 67da7cba7516fdeeda099a9b231d33b3712da6f4 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:46:09 -0600 Subject: [PATCH 5/6] Update test --- test/helpers/hotkeys_helper_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/hotkeys_helper_test.rb b/test/helpers/hotkeys_helper_test.rb index 7201d7566..176c41645 100644 --- a/test/helpers/hotkeys_helper_test.rb +++ b/test/helpers/hotkeys_helper_test.rb @@ -18,13 +18,13 @@ class HotkeysHelperTest < ActionView::TestCase test "mac enter" do emulate_mac - assert_equal "⏎+J", hotkey_label([ "enter", "J" ]) + assert_equal "return+J", hotkey_label([ "enter", "J" ]) end test "linux enter" do emulate_linux - assert_equal "⏎+J", hotkey_label([ "enter", "J" ]) + assert_equal "enter+J", hotkey_label([ "enter", "J" ]) end test "mac hyper" do From f35623b75f7a26781baa9950b9fd7cef6d3a5c50 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Nov 2025 16:47:02 -0600 Subject: [PATCH 6/6] Capitalize --- test/helpers/hotkeys_helper_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers/hotkeys_helper_test.rb b/test/helpers/hotkeys_helper_test.rb index 176c41645..ec96f6c9c 100644 --- a/test/helpers/hotkeys_helper_test.rb +++ b/test/helpers/hotkeys_helper_test.rb @@ -18,13 +18,13 @@ class HotkeysHelperTest < ActionView::TestCase test "mac enter" do emulate_mac - assert_equal "return+J", hotkey_label([ "enter", "J" ]) + assert_equal "Return+J", hotkey_label([ "enter", "J" ]) end test "linux enter" do emulate_linux - assert_equal "enter+J", hotkey_label([ "enter", "J" ]) + assert_equal "Enter+J", hotkey_label([ "enter", "J" ]) end test "mac hyper" do