Skip to content

Commit a75d56d

Browse files
author
Denis Švara
committed
Merge branch 'main' into pins-api
* main: (127 commits) Align board name start so it doesn't get too big Clean up card/events header layout Sync email to Stripe when user changes email address (#2432) Fix IDOR in webhook activation endpoint (#2431) Add card reactions to API docs and reactions_url to card JSON (#2427) Remove unnecessary claude plan Allow boosts on cards (#2411) Revert "Fix notification click URL by using correct data property" Add migration to remove draft cards from search index Guard search indexing with searchable? check Forbid comments on draft cards prefactor: update search to use published cards Fix notification click URL by using correct data property Wait for service worker to be active before subscribing Fix stuck state when permission granted but no subscription Extract Card::Commentable Include arm64 build in Docker workflow Remove unnecessary `await` in push handler Correctly initialise WebPush connection (#2417) Update models, views, and fixtures for polymorphic reactions ...
2 parents 8e24988 + 0252734 commit a75d56d

File tree

188 files changed

+2246
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+2246
-465
lines changed

.claude/CLAUDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@../AGENTS.md

.github/workflows/publish-image.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
- runner: ubuntu-latest
3535
platform: linux/amd64
3636
arch: amd64
37+
- runner: ubuntu-24.04-arm
38+
platform: linux/arm64
39+
arch: arm64
3740
env:
3841
REGISTRY: ghcr.io
3942
IMAGE_NAME: ${{ github.repository }}
@@ -170,11 +173,13 @@ jobs:
170173
docker buildx imagetools create \
171174
--tag "$tag" \
172175
--annotation "index:org.opencontainers.image.description=${IMAGE_DESCRIPTION}" \
173-
"${src_tag}-amd64"
176+
"${src_tag}-amd64" \
177+
"${src_tag}-arm64"
174178
else
175179
docker buildx imagetools create \
176180
--tag "$tag" \
177-
"${src_tag}-amd64"
181+
"${src_tag}-amd64" \
182+
"${src_tag}-arm64"
178183
fi
179184
done <<< "$tags"
180185

CLAUDE.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GIT
22
remote: https://github.com/basecamp/lexxy
3-
revision: 7c197c0afc7095c89df9cb6e24484df9e7212ac8
3+
revision: 4f0fc4d5773bc6892de70f175440c259974c12a7
44
specs:
5-
lexxy (0.1.24.beta)
5+
lexxy (0.7.0.beta)
66
rails (>= 8.0.2)
77

88
GIT
@@ -147,7 +147,7 @@ GEM
147147
benchmark (0.5.0)
148148
bigdecimal (4.0.1)
149149
bindex (0.8.1)
150-
bootsnap (1.20.1)
150+
bootsnap (1.21.1)
151151
msgpack (~> 1.2)
152152
brakeman (7.1.2)
153153
racc
@@ -449,7 +449,7 @@ GEM
449449
timeout (0.6.0)
450450
trilogy (2.9.0)
451451
tsort (0.2.0)
452-
turbo-rails (2.0.20)
452+
turbo-rails (2.0.21)
453453
actionpack (>= 7.1.0)
454454
railties (>= 7.1.0)
455455
tzinfo (2.0.6)

Gemfile.saas.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ GIT
2121

2222
GIT
2323
remote: https://github.com/basecamp/lexxy
24-
revision: 7c197c0afc7095c89df9cb6e24484df9e7212ac8
24+
revision: 4f0fc4d5773bc6892de70f175440c259974c12a7
2525
specs:
26-
lexxy (0.1.24.beta)
26+
lexxy (0.7.0.beta)
2727
rails (>= 8.0.2)
2828

2929
GIT
@@ -225,7 +225,7 @@ GEM
225225
benchmark (0.5.0)
226226
bigdecimal (4.0.1)
227227
bindex (0.8.1)
228-
bootsnap (1.20.1)
228+
bootsnap (1.21.1)
229229
msgpack (~> 1.2)
230230
brakeman (7.1.2)
231231
racc
@@ -568,7 +568,7 @@ GEM
568568
timeout (0.6.0)
569569
trilogy (2.9.0)
570570
tsort (0.2.0)
571-
turbo-rails (2.0.20)
571+
turbo-rails (2.0.21)
572572
actionpack (>= 7.1.0)
573573
railties (>= 7.1.0)
574574
tzinfo (2.0.6)

app/assets/images/person.svg

Lines changed: 1 addition & 1 deletion
Loading

app/assets/stylesheets/card-columns.css

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@
378378
}
379379

380380
.cards__menu {
381+
position: relative;
381382
z-index: var(--z-popup);
382383
}
383384

@@ -535,16 +536,33 @@
535536
/* Set lower limit for font size */
536537
font-size: clamp(0.6rem, 0.85cqi, 100px);
537538

539+
.card__counts {
540+
--gap: 0.5ch;
541+
542+
align-items: flex-end;
543+
display: flex;
544+
flex-shrink: 0;
545+
gap: calc(2 * var(--gap));
546+
margin-inline: auto calc(var(--card-padding-inline) * -0.5);
547+
padding-inline-start: var(--gap);
548+
}
549+
550+
.card__boosts,
538551
.card__comments {
539-
--column-gap: 0.8ch;
552+
--icon-size: 1.6em;
540553

554+
align-items: center;
541555
display: flex;
542-
margin-block-end: calc(var(--block-space) * -1.7);
543-
margin-inline-end: calc(var(--card-padding-inline) * -0.5);
556+
flex-shrink: 0;
557+
font-weight: 600;
558+
gap: var(--gap);
544559

545-
.icon {
546-
--icon-size: 1.6em;
560+
img {
561+
block-size: var(--icon-size);
562+
inline-size: var(--icon-size);
563+
}
547564

565+
.icon--comment {
548566
color: var(--card-color);
549567
}
550568
}
@@ -583,19 +601,36 @@
583601
.local-time-value {
584602
font-weight: inherit;
585603
}
604+
605+
@media (max-width: 639px) {
606+
inline-size: auto;
607+
}
586608
}
587609

588-
.card:has(.card__background img:not([src=""])) {
610+
&:has(.card__background img:not([src=""])) {
589611
.card__content,
590612
.card__meta,
613+
.card__boosts,
614+
.card__comments,
591615
.card__column-name:not(.card__column-name--current) {
592616
opacity: 0;
593617
transition: opacity 0.2s ease-in-out;
618+
}
594619

595-
@media (any-hover: hover) {
596-
.card:hover & {
620+
@media (any-hover: hover) {
621+
&:hover {
622+
.card__content,
623+
.card__footer,
624+
.card__boosts,
625+
.card__comments,
626+
.card__column-name:not(.card__column-name--current) {
597627
opacity: 1;
598628
}
629+
630+
.card__background img {
631+
filter: blur(3px) brightness(1.2);
632+
opacity: 0.2;
633+
}
599634
}
600635
}
601636
}
@@ -604,13 +639,6 @@
604639
inset-inline-start: 100%;
605640
translate: -90% -40%;
606641
}
607-
608-
@media (any-hover: hover) {
609-
.card:has(.card__background img:not([src=""])):hover .card__background img:not([src=""]) {
610-
filter: blur(3px) brightness(1.2);
611-
opacity: 0.2;
612-
}
613-
}
614642
}
615643

616644
/* Considering

0 commit comments

Comments
 (0)