Skip to content
Merged

Dev #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5bf220f
docs(repo): forbid local main merges
xrdavies Apr 8, 2026
c5411ef
fix(home): rework contributor overview
xrdavies Apr 8, 2026
48a8985
fix(home): tighten contributor section
xrdavies Apr 8, 2026
304effa
fix(home): remove homepage stats strip
xrdavies Apr 8, 2026
f3239d8
fix(home): remove contributor role counts
xrdavies Apr 8, 2026
865792c
fix(home): remove contributor role labels
xrdavies Apr 8, 2026
3e51e74
chore(contributors): add volunteer preview fixtures
xrdavies Apr 8, 2026
43e08ca
fix(home): soften contributor collage
xrdavies Apr 8, 2026
e90c2c1
fix(home): widen contributor collage
xrdavies Apr 8, 2026
3f27d3d
fix(home): add contributor collage texture
xrdavies Apr 9, 2026
184d5c3
fix(home): restyle contributor photo wall
xrdavies Apr 9, 2026
f17e792
fix(home): align contributor wall layout
xrdavies Apr 9, 2026
5b6ffb4
fix(home): add hierarchy to contributor wall
xrdavies Apr 9, 2026
1400e33
fix(home): expand contributor wall coverage
xrdavies Apr 9, 2026
ecccead
fix(home): remove contributor wall overlaps
xrdavies Apr 9, 2026
644f257
fix(home): reduce contributor wall density
xrdavies Apr 9, 2026
f836d3a
feat(home): randomize contributor previews
xrdavies Apr 9, 2026
8e9bfdc
feat(web): refresh contributor wall copy
xrdavies Apr 9, 2026
5a9abf8
test(web): add contributor wall manual check
xrdavies Apr 9, 2026
94cfd5a
fix(web): run astro check in local mode
xrdavies Apr 9, 2026
dc8f706
fix(home): lower contributor wall avatars
xrdavies Apr 9, 2026
1253cb8
fix(home): lower contributor avatars further
xrdavies Apr 9, 2026
e71b7c2
fix(home): shift contributor tiles within board
xrdavies Apr 9, 2026
6741dd8
fix(home): restore contributor tile hover
xrdavies Apr 9, 2026
805b32c
fix(home): add more space above contributor tiles
xrdavies Apr 9, 2026
cddab98
style(home): refine contributor board tape
xrdavies Apr 9, 2026
366e5a7
revert(home): restore simple contributor tape
xrdavies Apr 9, 2026
477b24f
fix(home): increase contributor board height
xrdavies Apr 9, 2026
c045109
Merge branch 'main' into dev
xrdavies Apr 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview --host",
"lint": "eslint .",
"check": "astro check"
"check": "ASTRO_LOCAL_DEV=true astro check"
},
"dependencies": {
"@astrojs/cloudflare": "^13.1.7",
Expand Down
83 changes: 63 additions & 20 deletions apps/web/src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,16 @@ const liveWireTypeLabel = {
/>
<article class="card contributors-overview">
<div class="contributors-copy">
<p class="contributors-kicker">社区照片墙</p>
<div class="contributors-intro">
<h3>先看见真实的人,再进入完整的贡献者档案。</h3>
<p>
Rebase 由志愿者、编辑与长期协作者共同维护。首页先给出一张不断扩展的社区群像,再进入完整的贡献者档案。
Rebase 由志愿者、编辑与长期协作者共同维护。这里先展示一组持续变化的公开面孔,让社区的气质先被看见。
</p>
</div>

<p class="contributors-note">
这些公开档案覆盖内容整理、活动组织、推荐与编辑协作。更多参与者的故事与联系方式,会在独立页面里持续补全。
内容整理、活动组织、推荐协作与长期共建,都会慢慢沉淀成可被看见的记录。
</p>
</div>

Expand Down Expand Up @@ -520,29 +522,58 @@ const liveWireTypeLabel = {
position: relative;
z-index: 1;
display: grid;
gap: 0.75rem;
gap: 0.9rem;
max-width: 30rem;
}

.contributors-kicker,
.contributors-intro h3,
.contributors-intro p,
.contributors-note {
margin: 0;
color: var(--muted);
}

.contributors-kicker {
display: inline-flex;
align-items: center;
width: fit-content;
padding: 0.36rem 0.72rem;
border: 1px solid rgba(15, 118, 110, 0.16);
border-radius: 999px;
background: rgba(255, 255, 255, 0.8);
color: rgba(15, 118, 110, 0.88);
font-size: 0.75rem;
font-weight: 700;
letter-spacing: 0.08em;
}

.contributors-intro {
max-width: 58ch;
display: grid;
gap: 0.72rem;
}

.contributors-intro p {
.contributors-intro h3 {
max-width: 12ch;
color: var(--text);
font-size: 1.02rem;
line-height: 1.78;
font-size: clamp(1.45rem, 1.8vw + 1rem, 2rem);
line-height: 1.16;
letter-spacing: -0.03em;
}

.contributors-intro p {
max-width: 52ch;
color: var(--muted);
font-size: 1rem;
line-height: 1.76;
}

.contributors-note {
max-width: 56ch;
font-size: 0.95rem;
line-height: 1.7;
max-width: 46ch;
padding-top: 0.88rem;
border-top: 1px solid rgba(15, 118, 110, 0.1);
color: rgba(62, 86, 76, 0.88);
font-size: 0.92rem;
line-height: 1.72;
}

.contributors-cloud {
Expand All @@ -556,7 +587,7 @@ const liveWireTypeLabel = {
justify-content: end;
width: min(100%, 33rem);
margin-left: auto;
padding: 1.15rem 0.75rem 0.95rem 0.9rem;
padding: 1.85rem 0.75rem 1.28rem 0.9rem;
}

.contributors-cloud::before {
Expand Down Expand Up @@ -590,14 +621,22 @@ const liveWireTypeLabel = {
}

.avatar-token {
--avatar-rotation: 0deg;
--avatar-hover-shift: 0rem;
--avatar-scale: 1;
position: relative;
top: 0.72rem;
justify-self: center;
width: 5.05rem;
padding: 0.3rem 0.3rem 0.78rem;
border: 1px solid rgba(15, 118, 110, 0.1);
border-radius: 0.7rem;
background: rgba(255, 255, 255, 0.96);
box-shadow: 0 18px 36px rgba(26, 40, 34, 0.12);
transform:
translateY(var(--avatar-hover-shift))
rotate(var(--avatar-rotation))
scale(var(--avatar-scale));
transition: transform 180ms ease, box-shadow 180ms ease, border-color 180ms ease;
}

Expand Down Expand Up @@ -626,7 +665,8 @@ const liveWireTypeLabel = {

.avatar-token:hover,
.avatar-token:focus-visible {
transform: translateY(-0.18rem) scale(1.02);
--avatar-hover-shift: -0.18rem;
--avatar-scale: 1.02;
border-color: rgba(15, 118, 110, 0.22);
box-shadow: 0 18px 38px rgba(26, 40, 34, 0.14);
}
Expand All @@ -640,25 +680,25 @@ const liveWireTypeLabel = {
}

.avatar-token:nth-child(5n + 1) {
transform: rotate(-5deg);
--avatar-rotation: -5deg;
justify-self: start;
}

.avatar-token:nth-child(5n + 2) {
transform: rotate(4deg);
--avatar-rotation: 4deg;
}

.avatar-token:nth-child(5n + 3) {
transform: rotate(6deg);
--avatar-rotation: 6deg;
margin-top: 0.15rem;
}

.avatar-token:nth-child(5n + 4) {
transform: rotate(-4deg);
--avatar-rotation: -4deg;
}

.avatar-token:nth-child(5n) {
transform: rotate(3deg);
--avatar-rotation: 3deg;
justify-self: end;
margin-top: 0.25rem;
}
Expand Down Expand Up @@ -713,7 +753,7 @@ const liveWireTypeLabel = {
width: 100%;
justify-content: start;
margin-left: 0;
padding: 1rem 0 0.85rem;
padding: 1.45rem 0 1.1rem;
}

.contributors-cloud::before {
Expand All @@ -725,8 +765,11 @@ const liveWireTypeLabel = {
}

.avatar-token:nth-child(n) {
--avatar-rotation: 0deg;
--avatar-hover-shift: 0rem;
--avatar-scale: 1;
top: 0;
width: 5rem;
transform: none;
margin-top: 0;
justify-self: start;
}
Expand Down
49 changes: 49 additions & 0 deletions tests/manual/contributor-wall.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { test, expect } from '@playwright/test';

test.describe('manual contributor wall check', () => {
test('left copy block maintains spacing from avatar wall and avatars do not overlap', async ({ page }) => {
await page.goto('/');

const section = page.locator('article.contributors-overview');
await expect(section).toBeVisible();

const copy = section.locator('.contributors-copy');
const cloud = section.locator('.contributors-cloud');
const copyBox = await copy.boundingBox();
const cloudBox = await cloud.boundingBox();
expect(copyBox).toBeTruthy();
expect(cloudBox).toBeTruthy();

if (copyBox && cloudBox) {
expect(copyBox.x + copyBox.width).toBeLessThan(cloudBox.x - 8);
}

await expect(copy.locator('.contributors-kicker')).toHaveText('社区照片墙');
await expect(copy.locator('.contributors-intro h3')).toHaveText(/先看见真实的人/);

const avatars = cloud.locator('.avatar-token');
const avatarCount = await avatars.count();
expect(avatarCount).toBe(10);

const boxes = await Promise.all(
Array.from({ length: avatarCount }).map((_, index) =>
avatars.nth(index).boundingBox(),
),
);

const overlaps = boxes.some((own, index) => {
if (!own) return false;
return boxes.slice(index + 1).some((other) => {
if (!other) return false;
return (
own.x < other.x + other.width &&
own.x + own.width > other.x &&
own.y < other.y + other.height &&
own.y + own.height > other.y
);
});
});

expect(overlaps).toBeFalsy();
});
});
Loading