Skip to content

Commit 768e7a3

Browse files
authored
Merge pull request basecamp#2689 from basecamp/mobile/tweak-card-perma-footer
Mobile / Tweak card perma footer
2 parents 19dbdc6 + 31975be commit 768e7a3

File tree

2 files changed

+60
-17
lines changed

2 files changed

+60
-17
lines changed

app/assets/stylesheets/card-perma.css

Lines changed: 59 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -156,37 +156,74 @@
156156
@media (max-width: 639px) {
157157
--meta-spacer-block: 0.75ch;
158158

159-
inline-size: 100%;
160-
grid-template-areas:
161-
"avatars-author text-added"
162-
"avatars-author text-author"
163-
"text-updated text-updated"
164-
"text-assignees text-assignees"
165-
"avatars-assignees avatars-assignees";
166-
grid-template-columns: auto 1fr;
159+
min-inline-size: 0;
160+
gap: calc(var(--meta-spacer-block) / 2);
161+
display: flex;
162+
flex-wrap: wrap;
167163

168164
.card__meta-text {
169165
border: 0;
170166
padding: 0;
171167
}
172168

173-
.card__meta-text + .card__meta-text {
169+
.card__meta-avatars--author {
170+
--btn-size: 1.5em;
171+
172+
display: initial;
173+
margin-inline-end: unset;
174+
order: 3;
175+
}
176+
177+
.card__meta-text--added {
178+
inline-size: 100%;
179+
order: 1;
180+
}
181+
182+
.card__meta-text--author {
183+
order: 2;
184+
}
185+
186+
.card__meta-text--updated {
174187
border-block-start: var(--card-border);
175-
margin-block-start: var(--meta-spacer-block);
188+
inline-size: 100%;
189+
margin-block-start: calc(var(--meta-spacer-block) * 0.5);
190+
order: 4;
176191
padding-block-start: var(--meta-spacer-block);
177192
}
178193

194+
.card__meta-text--assignees {
195+
margin-block-start: calc(var(--meta-spacer-block) * 3);
196+
order: 6;
197+
white-space: unset !important;
198+
}
199+
179200
.card__meta-avatars--assignees {
180-
margin-inline: 0;
181-
margin-block-start: var(--meta-spacer-block);
201+
margin-inline: 0 var(--meta-spacer-inline);
202+
margin-block-start: calc(var(--meta-spacer-block) * 3);
203+
order: 5;
204+
205+
.avatar {
206+
display: grid;
207+
}
182208
}
183209

184-
.card__meta-avatars--author {
185-
display: initial;
210+
&:has(.card__meta-avatars--assignees .avatar) {
211+
.card__meta-text--assignees {
212+
order: 5;
213+
}
214+
215+
.card__meta-avatars--assignees {
216+
margin-block-start: var(--meta-spacer-block);
217+
order: 6;
218+
}
186219
}
220+
}
221+
}
187222

188-
.card__meta-avatars--assignees .avatar {
189-
display: grid;
223+
&:has(.card__closed) .card__meta {
224+
@media (max-width: 639px) {
225+
.card__meta-avatars--assignees {
226+
display: none;
190227
}
191228
}
192229
}
@@ -252,10 +289,16 @@
252289
@media (max-width: 639px) {
253290
display: grid;
254291
font-size: var(--text-x-small);
292+
gap: 1ch 0;
255293
grid-template-columns: 1fr auto;
256294
grid-template-areas:
257295
"meta bg-zoom"
258296
"meta reactions";
297+
298+
&:not(:has(.reaction)),
299+
&:has(.card__background) {
300+
column-gap: 2ch;
301+
}
259302
}
260303
}
261304

app/models/user/named.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ def initials
2020
def familiar_name
2121
names = name.split
2222
return name if names.length <= 1
23-
"#{names.first} #{names[1..].map { |n| "#{n[0]}." }.join}"
23+
"#{names.first}\u00A0#{names[1..].map { |n| "#{n[0]}." }.join}"
2424
end
2525
end

0 commit comments

Comments
 (0)