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

Merge pull request #1069 from basecamp/jz/polish-9-9-25

Browse Source 
Jz/polish 9 9 25
This commit is contained in:
Jason Zimdars
2025-09-09 20:35:12 -05:00
committed by GitHub
parent 3a129414af 0e0de36ca2
commit 91c9cb51af
10 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/images/add--meta.svg
+1
View File
@@ -0,0 +1 @@
<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m29.1 13.1h-10.2v-10.1c0-1.5-1.3-2.8-2.8-2.8h-.2c-1.5 0-2.8 1.3-2.8 2.8v10.1h-10.2c-1.6 0-2.9 1.2-2.9 2.8v.2c0 1.5 1.3 2.8 2.8 2.8h10.2v10.3c0 1.5 1.3 2.8 2.8 2.8h.2c1.5 0 2.8-1.3 2.8-2.8v-10.3h10.2c1.5 0 2.8-1.3 2.8-2.8v-.2c0-1.5-1.3-2.8-2.8-2.8z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 325 B

app/assets/images/refresh--meta.svg
+1
View File
@@ -0,0 +1 @@
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m-44.4 1.7c2.2-2.2 5.4-3 8.4-2 .7.2 1.4-.2 1.6-.8.2-.7-.2-1.4-.8-1.6-5.7-1.8-11.7 1.3-13.5 7-.8 2.4-.7 5 .3 7.3v.3l-1.4.9c-.5.3-.6.9-.3 1.4.1.2.4.4.6.4l4.4.9h.2c.5 0 .9-.3 1-.8l.9-4.4c.1-.5-.2-1.1-.8-1.2-.3 0-.5 0-.8.1l-1.3.9c-.1 0-.3 0-.3 0-.9-2.9-.2-6.2 2-8.3z"/><path d="m-26.7 1.3c0-.4-.4-.7-.8-.8l-4.4-1c-.5-.1-1.1.2-1.2.7l-1 4.4c-.1.5.2 1.1.8 1.2.3 0 .5 0 .8-.1l1.4-.9h.2s.1 0 .2.2c1.4 4.3-1 9-5.3 10.4-1.6.5-3.4.5-5 0-.7-.2-1.4.1-1.6.8s.1 1.4.8 1.6c5.7 1.8 11.7-1.4 13.4-7.1.7-2.4.6-4.9-.3-7.2 0-.1 0-.2.1-.3l1.3-.8c.3-.2.5-.6.5-1z"/><rect height="5" rx="2.5" transform="matrix(0 -1 1 0 30.8 65.4)" width="32" x="32.1" y="14.8"/><path d="m24 6.4c0-.1 0-.2-.2-.2l-6.4-1.9c-.1 0-.3 0-.3.2l-1.9 6.4v.3h.2s0 0 .1 0l2.5-1.4c.3.7.4 1.5.4 2.3 0 3.6-2.9 6.5-6.5 6.5s-1.2 0-1.7-.2c-1.1-.3-2.2.3-2.5 1.4s.3 2.2 1.4 2.5c.9.3 1.9.4 2.8.4 5.8 0 10.5-4.7 10.5-10.5s-.3-2.9-.9-4.2l2.2-1.2s.1-.1.1-.2z"/><path d="m8.6 12.9s-.2 0-.3 0l-2.5 1.4c-.3-.7-.4-1.5-.4-2.2 0-3.6 2.9-6.5 6.5-6.5s1.2 0 1.7.2c1.1.3 2.2-.3 2.5-1.4s-.3-2.2-1.4-2.5c-.9-.2-1.8-.4-2.8-.4-5.7-0-10.4 4.7-10.4 10.5s.3 2.8.9 4.2l-2.2 1.2s-.1.1-.1.2 0 .2.2.2l6.4 1.9s0 0 0 0c.1 0 .2 0 .2-.2l1.9-6.4s0-.2 0-.3z"/><circle cx="40" cy="-9" fill="none" r="8.5" stroke="#000" stroke-miterlimit="10" stroke-width="4"/><path d="m51.2-14.7-5-1.5c-.3 0-.5 0-.8 0-.2.1-.4.3-.5.6l-1.5 5c-.1.4 0 .8.3 1 .2.1.4.2.6.2s.3 0 .5-.1l6.5-3.6c.3-.2.5-.6.5-1s-.3-.7-.7-.8z"/><path d="m28.7-3.7 5 1.5h.8c.2-.1.4-.3.5-.6l1.5-5c.1-.4 0-.8-.3-1-.2-.1-.4-.2-.6-.2s-.3 0-.5.1l-6.5 3.6c-.3.2-.5.6-.5 1s.3.7.7.8z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

app/assets/stylesheets/card-columns.css
+2 -3
View File
@@ -5,7 +5,7 @@
/* Card contents are resized via container queries. We're using #main here as
the primary container so all cards have the same container reference */
#main:has(.card-columns) {
--cards-gap: min(1cqi, 0.7rem);
--cards-gap: min(1.5cqi, 1.5rem);
--gradient-border: linear-gradient(to right,var(--color-canvas), var(--color-ink) 3%, var(--color-ink) 97%, var(--color-canvas));
--reserved-bubble-space: 0;
--bubble-gap: 0.5rem;
@@ -206,8 +206,7 @@
}
@media (min-width: 640px) {
margin-inline: calc(var(--cards-gap) * -1);
padding-inline: calc(var(--cards-gap) * 2);
padding-inline: var(--cards-gap);
}
.cards__decoration {
app/assets/stylesheets/cards.css
+7
View File
@@ -244,6 +244,13 @@
.card__meta-text {
line-height: 1;
white-space: nowrap;
.icon {
--icon-size: 0.9em;
margin-inline-end: 0.5ch;
vertical-align: top;
}
}
/* Top */
app/assets/stylesheets/drag_and_drop.css
+1 -2
View File
@@ -8,10 +8,9 @@
.drag-and-drop__hover-container {
background-color: var(--color-selected-light);
border-radius: 0.1em;
outline: 2px dashed var(--color-selected-dark);
transition: background-color 200ms;
z-index: 3;
z-index: 1;
.cards__heading {
background-color: transparent;
app/assets/stylesheets/filters.css
+1
View File
@@ -1,5 +1,6 @@
@layer components {
.filters {
position: relative;
view-transition-name: "filters";
z-index: var(--z-popup);
app/assets/stylesheets/icons.css
+2
View File
@@ -18,6 +18,7 @@
}
.icon--add { --svg: url("add.svg "); }
.icon--add--meta { --svg: url("add--meta.svg "); }
.icon--arrow-left { --svg: url("arrow-left.svg "); }
.icon--arrow-right { --svg: url("arrow-right.svg "); }
.icon--arrow-up { --svg: url("arrow-up.svg "); }
@@ -74,6 +75,7 @@
.icon--qr-code { --svg: url("qr-code.svg "); }
.icon--reaction { --svg: url("reaction.svg "); }
.icon--refresh { --svg: url("refresh.svg "); }
.icon--refresh--meta { --svg: url("refresh--meta.svg "); }
.icon--remove-med { --svg: url("remove-med.svg "); }
.icon--remove { --svg: url("remove.svg "); }
.icon--rename { --svg: url("rename.svg "); }
app/assets/stylesheets/trays.css
+2 -2
View File
@@ -308,7 +308,7 @@
}
.card__body {
margin-block-start: -0.3em;
margin-block-start: 0.2em;
padding-block-end: 0;
}
@@ -397,7 +397,7 @@
.card__body {
display: block;
margin: 0;
margin-block-start: 0.3em;
}
.workflow-stage--current {
app/views/cards/display/common/_meta.html.erb
+4
View File
@@ -4,6 +4,7 @@
</div>
<span class="card__meta-text card__meta-text--added">
<%= icon_tag "add--meta" %>
Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
<% if card.drafted? %>
<strong>(Draft)</strong>
@@ -11,6 +12,7 @@
</span>
<span class="card__meta-text card__meta-text--author">
<%= icon_tag "arrow-up" %>
By <strong><%= card.creator.familiar_name %></strong>
</span>
@@ -18,12 +20,14 @@
<% if card.creating? %>
&nbsp;
<% else %>
<%= icon_tag "refresh--meta" %>
Updated
<%= local_datetime_tag(card.last_active_at, style: :daysago) %>
<% end %>
</span>
<span class="card__meta-text card__meta-text--assignees overflow-ellipsis">
<%= icon_tag "arrow-right" if card.assignees.any? %>
<%= "Assigned to" if card.assignees.any? %>
<%= card.assignees.map { |assignee| "<strong>#{assignee.familiar_name}</strong>" }.to_sentence.html_safe %>
</span>
app/views/cards/display/preview/_meta.html.erb
+30 -3
View File
@@ -1,3 +1,30 @@
<%= render "cards/display/common/meta", card: card, preview: true do %>
<%= render "cards/display/preview/assignees", card: card %>
<% end %>
<div class="card__meta" id="<%= dom_id(card, :meta) %>">
<div class="card__meta-avatars card__meta-avatars--author">
<%= avatar_tag card.creator, tabindex: (local_assigns.key?(:preview) && local_assigns[:preview]) ? -1 : 0 %>
</div>
<span class="card__meta-text card__meta-text--added">
<%= icon_tag "add--meta" %>
<%= local_datetime_tag(card.created_at, style: :daysago) %>
<% "(Draft)" if card.drafted? %>
</span>
<span class="card__meta-text card__meta-text--author">
<%= icon_tag "arrow-up" %>
<%= card.creator.familiar_name %>
</span>
<span class="card__meta-text card__meta-text--updated overflow-ellipsis">
<%= icon_tag "refresh--meta" %>
<%= local_datetime_tag(card.last_active_at, style: :daysago) %>
</span>
<span class="card__meta-text card__meta-text--assignees overflow-ellipsis">
<%= icon_tag "arrow-right" if card.assignees.any? %>
<%= card.assignees.map { |assignee| assignee.familiar_name }.to_sentence.html_safe %>
</span>
<div class="card__meta-avatars card__meta-avatars--assignees">
<%= render "cards/display/preview/assignees", card: card %>
</div>
</div>