Merge pull request #1475 from basecamp/fizzy-menu-hotkey

Just put the hotkey on the button

app/views/my/menus/_button.html.erb

@@ -1,7 +1,8 @@
-<%= tag.button class:"boxcar-menu-trigger input input--select center flex-inline align-center txt-normal",
+<%= tag.button class:"boxcar-menu-trigger input input--select center flex-inline gap-half align-center txt-normal",
       data: {
         action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
         controller: "hotkey" } do %>
   <span><%= image_tag "logo.png" %></span>
   <strong class="txt-medium overflow-ellipsis margin-none">Fizzy</strong>
+  <kbd class="kbd txt-xx-small">J</kbd>
 <% end %>

app/views/my/menus/_footer.html.erb

@@ -0,0 +1,3 @@
+<footer class="popup__footer">
+  Fizzy is designed, built, and backed by <strong class="txt-nowrap"><%= icon_tag "37signals", class: "v-align-middle" %> <a href="https://37signals.com" target="_blank" class="txt-ink">37signals</a>.</strong>
+</footer>

app/views/my/menus/_hotkeys.html.erb

@@ -1,4 +1,4 @@
-<div class="boxcar-menu__hotkeys" role="list">
+<div class="boxcar-menu__hotkeys margin-block-end-half" role="list">
   <%= filter_hotkey_link "Home", root_path, 1, "home" %>
   <%= filter_hotkey_link "New board", new_collection_path, 2, "collection-add" %>
   <%= filter_hotkey_link "Assigned to me", cards_path(assignee_ids: [Current.user.id]), 3, "clipboard" %>

app/views/my/menus/_shortcut_notice.html.erb

@@ -1,5 +0,0 @@
-<% if platform.desktop? %>
-  <footer class="popup__footer">
-    Press <kbd class="kbd">J</kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate.
-  </footer>
-<% end %>

app/views/my/menus/show.html.erb

@@ -9,17 +9,11 @@
   </div>
 
   <%= render "hotkeys" %>
-
-  <div class="margin-block-start-half txt-x-small txt-align-center">
-    Fizzy is designed, built, and backed by <strong class="txt-nowrap"><%= icon_tag "37signals", class: "v-align-middle" %> <a href="https://37signals.com" target="_blank" class="txt-ink">37signals</a>.</strong>
-  </div>
-
   <%= render "saved_filter", filters: @user_filtering.filters %>
   <%= render "collections", user_filtering: @user_filtering %>
   <%= render "tags", user_filtering: @user_filtering %>
   <%= render "users", user_filtering: @user_filtering %>
   <%= render "places", user_filtering: @user_filtering %>
   <%= render "accounts", user_filtering: @user_filtering %>
-
-  <%= render "shortcut_notice" %>
+  <%= render "footer" %>
 <% end %>