Skip to content

Commit 0252734

Browse files
authored
Merge pull request #2435 from basecamp/card-header-alignment
Card header alignment
2 parents f2ff5af + 8cfcc6f commit 0252734

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

app/assets/images/person.svg

Lines changed: 1 addition & 1 deletion
Loading

app/assets/stylesheets/cards.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
}
6363

6464
.card__board {
65+
align-items: center;
66+
align-self: start;
6567
background-color: var(--card-color);
6668
border-radius: var(--border-radius) 0 var(--border-radius) 0;
6769
color: var(--color-ink-inverted);

app/assets/stylesheets/events.css

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@
287287

288288
.event {
289289
--column-gap: 0.7ch;
290+
--event-padding: 0.6em;
290291

291292
background-color: color-mix(in srgb, var(--card-color) 10%, var(--color-canvas));
292293
border-radius: 0.2em;
@@ -296,7 +297,7 @@
296297
max-inline-size: 100%;
297298
min-inline-size: 0;
298299
overflow: clip;
299-
padding: 0.6em;
300+
padding: var(--event-padding);
300301
position: relative;
301302
z-index: 0;
302303

@@ -321,12 +322,15 @@
321322
z-index: 0;
322323
}
323324

325+
.card__header {
326+
inline-size: 100%;
327+
margin-block-start: calc(-1 * var(--event-padding));
328+
}
329+
324330
.card__board {
325331
background-color: transparent;
326332
color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink));
327333
font-size: 0.7em;
328-
padding: 0;
329-
translate: 0 -0.3em;
330334
}
331335

332336
.card__board-name {
@@ -373,16 +377,11 @@
373377
}
374378

375379
.event__icon {
380+
color: var(--card-color);
376381
display: grid;
377-
margin: -0.3em -0.3em auto auto;
382+
margin-inline-start: auto;
378383
place-content: center;
379-
380-
.icon {
381-
background-color: var(--card-color);
382-
block-size: 1em;
383-
inline-size: 1em;
384-
grid-area: 1 / 1;
385-
}
384+
translate: calc(var(--event-padding) / 2);
386385
}
387386

388387
.event__timestamp {

app/views/events/_event.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% cache event do %>
2-
<%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %>
2+
<%# Template Dependency Updated: _layout.html.erb 2026-01-26 %>
33
<% if lookup_context.exists?("events/event/eventable/_#{event.action}") %>
44
<%= render "events/event/eventable/#{event.action}", event: event %>
55
<% else %>

app/views/events/day_timeline/_columns.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<% cache [ day_timeline.events ] do %>
2+
<%# Template Dependency Updated: _layout.html.erb 2026-01-26 %>
23
<% if day_timeline.has_activity? %>
34
<div class="events__columns">
45
<%= render "events/day_timeline/column", column: day_timeline.added_column %>

app/views/events/event/_layout.html.erb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
related_element_target: "related",
88
related_element_group_value: card.id,
99
action: "mouseover->related-element#highlight mouseout->related-element#unhighlight" } do %>
10-
<div class="card__header flex align-start gap full-width">
11-
<h4 class="card__board flex-inline align-start">
10+
<div class="card__header">
11+
<h4 class="card__board">
1212
<span class="card__id">
1313
<span class="for-screen-reader">Card number</span>
1414
<%= card.number %>
@@ -19,9 +19,7 @@
1919
</h4>
2020

2121
<% unless event.action.in?(%w[ card_closed card_published card_reopened ]) %>
22-
<span class="event__icon flex-item-justify-end txt-reversed">
23-
<%= icon_tag event_action_icon(event) %>
24-
</span>
22+
<%= icon_tag event_action_icon(event), class: "event__icon" %>
2523
<% end %>
2624
</div>
2725
<div class="event__content">

0 commit comments

Comments
 (0)