bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1619 from basecamp/jz-11-17-25

Browse Source 
JZ 11-17-25
This commit is contained in:
Jason Zimdars
2025-11-17 17:47:49 -06:00
committed by GitHub
parent 91d1cd9bd4 cc9363987f
commit ffabf4482d
9 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/card-perma.css
+1 -1
View File
@@ -133,7 +133,7 @@
background-color: var(--color-container);
border-radius: 0.2em;
grid-area: card;
padding: clamp(2rem, 4vw, var(--padding-block)) clamp(16px, 4vw, var(--padding-inline));
padding: clamp(2rem, 4vw, var(--padding-block));
}
.card-perma__actions {
app/helpers/hotkeys_helper.rb
+3 -1
View File
@@ -5,7 +5,9 @@ module HotkeysHelper
if key == "ctrl" && platform.mac?
"⌘"
elsif key == "enter"
platform.mac? ? "return" : "enter"
"⏎"
elsif key == "shift"
"⇧"
else
key
end.capitalize
app/models/filter/fields.rb
+3 -1
View File
@@ -18,7 +18,9 @@ module Filter::Fields
def indexed_by_human_name(index)
case index
when "postponing_soon"
"Auto-closing soon"
"Closing soon"
when "closed"
"Done"
when "all"
"Open"
else
app/views/account/join_codes/edit.html.erb
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
<% end %>
<article class="panel center shadow flex flex-column gap-half" style="view-transition-name: <%= dom_id(@join_code) %>">
<article class="panel panel--wide center shadow flex flex-column gap-half" style="view-transition-name: <%= dom_id(@join_code) %>">
<header class="margin-block-end-half">
<h2 class="txt-large margin-none font-weight-black"><%= @page_title %></h2>
<p class="txt-medium margin-none">How many times can this link be used to join the account?</p>
app/views/account/join_codes/show.html.erb
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
<% end %>
<div class="panel shadow center flex flex-column gap" style="view-transition-name: <%= dom_id(@join_code) %>">
<div class="panel panel--wide shadow center flex flex-column gap" style="view-transition-name: <%= dom_id(@join_code) %>">
<header>
<h2 class="txt-large margin-none font-weight-black"><%= @page_title %></h2>
<p class="txt-medium margin-none">Share the link below to invite people to this account</p>
app/views/cards/comments/_new.html.erb
+2 -5
View File
@@ -17,13 +17,10 @@
<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 %>
</div>
</div>
app/views/cards/container/footer/_draft.html.erb
+12 -16
View File
@@ -1,19 +1,15 @@
<div class="card-perma__notch card-perma__notch--bottom">
<div class="flex flex-column gap-half">
<%= button_to card_publish_path(card), name: "creation_type", value: "add", class: "btn",
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>
<% end %>
<kbd class="txt-x-small txt-subtle center"><%= hotkey_label([ "ctrl", "enter" ]) %></kbd>
</div>
<%= button_to card_publish_path(card), name: "creation_type", value: "add", class: "btn",
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 %>
<div class="flex flex-column gap-half">
<%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
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>
<% end %>
<kbd class="txt-x-small txt-subtle center"><%= hotkey_label([ "ctrl", "shift", "enter" ]) %></kbd>
</div>
<%= button_to card_publish_path(card), method: :post, class: "btn btn--reversed", name: "creation_type", value: "add_another",
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 %>
</div>
app/views/sessions/new.html.erb
+1 -1
View File
@@ -10,7 +10,7 @@
</label>
</div>
<p><strong>New here?</strong> Enter your email to create an account. <strong>Already have an account?</strong> Enter your email and we'll get you signed in.</p>
<p><strong>New here?</strong> Enter your email to create an account. <strong>Already have an account?</strong> Enter your email and we’ll get you signed in.</p>
<button type="submit" id="log_in" class="btn btn--link center txt-medium">
<span>Let’s go</span>
test/helpers/hotkeys_helper_test.rb
+2 -2
View File
@@ -18,13 +18,13 @@ class HotkeysHelperTest < ActionView::TestCase
test "mac enter" do
emulate_mac
assert_equal "Return+J", hotkey_label([ "enter", "J" ])
assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
end
test "linux enter" do
emulate_linux
assert_equal "Enter+J", hotkey_label([ "enter", "J" ])
assert_equal "⏎+J", hotkey_label([ "enter", "J" ])
end
test "mac hyper" do