From 51a9edf41901d7cd4c6e2a5b9169854baee9e248 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 17 Nov 2025 17:35:14 -0600
Subject: [PATCH] Contain hotkeys inside the button

---
 app/views/cards/comments/_new.html.erb           | 6 ++----
 app/views/cards/container/footer/_draft.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index 5d80fed78..eb1264a74 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -17,11 +17,9 @@
         <span class="flex-inline align-center gap">
           <%= form.button class: "comment__submit btn btn--reversed",
               data: { form_target: "submit" }, disabled: true do %>
-            <span>Post this comment</span>
+            <span>Post</span>
+            <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
           <% end %>
-          <span class="hide-on-touch txt-subtle">
-            <kbd class="txt-x-small"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
-          </span>
         </span>
         <span data-form-target="cancel" hidden></span>
       <% end %>
diff --git a/app/views/cards/container/footer/_draft.html.erb b/app/views/cards/container/footer/_draft.html.erb
index b08d0e7a3..d1ca22ea1 100644
--- a/app/views/cards/container/footer/_draft.html.erb
+++ b/app/views/cards/container/footer/_draft.html.erb
@@ -4,8 +4,8 @@
           form: { data: { controller: "form" } },
           data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+enter@document->clicker#click keydown.meta+enter@document->clicker#click" } do %>
       <span>Create card</span>
+      <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
     <% end %>
-    <kbd class="txt-x-small txt-subtle center hide-on-touch"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
   </div>
 
   <div class="flex flex-column gap-half">
@@ -13,7 +13,7 @@
           title: "Create and add another (ctrl+shift+enter)", form: { data: { controller: "form" } },
           data: { form_target: "submit", controller: "clicker", action: "keydown.ctrl+shift+enter@document->clicker#click keydown.meta+shift+enter@document->clicker#click" } do %>
       <span>Create and add another</span>
+      <kbd class="txt-x-small hide-on-touch"><%= hotkey_label([ "ctrl", "shift", "enter" ]) %></kbd>
     <% end %>
-    <kbd class="txt-x-small txt-subtle center hide-on-touch"><%= hotkey_label([ "ctrl", "shift", "enter" ]) %></kbd>
   </div>
 </div>