Skip to content

Commit 9816b4a

Browse files
committed
Merge pull request #45 from dev
2 parents 7e24b55 + c2a6510 commit 9816b4a

6 files changed

Lines changed: 88 additions & 137 deletions

File tree

‎AGENTS.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ Examples:
2222
- Avoid mixing unrelated changes in the same commit.
2323
- Keep each commit scoped to a single clear goal so it is easy to review or revert.
2424

25+
## Branch and release flow
26+
27+
- Keep day-to-day work on `dev`.
28+
- After a coherent batch is committed locally, push it to `origin/dev`.
29+
- Open a pull request from `dev` to `main` for review and release tracking.
30+
- Merge the pull request into `main` only after the release candidate is ready.
31+
- Do not push release changes directly to `origin/main`.
32+
2533
## Documentation Map
2634

2735
- Start with `README.md` for the current project baseline and document index.

‎apps/web/src/pages/geekdaily/index.astro‎

Lines changed: 68 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
1818

1919
<BaseLayout
2020
site={site}
21-
title="GeekDaily 归档"
21+
title="Rebase极客日报"
2222
description="浏览、筛选并检索 Rebase 社区的 GeekDaily 历史归档。"
2323
>
2424
<section class="shell page-hero single">
@@ -29,58 +29,62 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
2929
</div>
3030
<h1 class="hero-title">Rebase 极客日报</h1>
3131
<p class="hero-summary">
32+
极客日报是 Rebase 最稳定的持续发声机制。每天更新的极客日报,把社区推荐、工具、研究和信号组织成可搜索、可订阅的长期档案。
3233
由社区志愿者持续整理发布,每期收录值得关注的技术内容、推荐人和推荐语,方便你按期回看、检索与订阅。
3334
</p>
3435
</article>
3536
</section>
3637

3738
<section class="shell page-section controls-grid">
3839
<div class="card search-panel">
39-
<label for="geekdaily-search">搜索 GeekDaily</label>
40+
<div class="search-head">
41+
<label for="geekdaily-search">搜索 GeekDaily</label>
42+
</div>
4043
<input
4144
id="geekdaily-search"
4245
name="q"
4346
type="search"
44-
placeholder="搜索期数、geekdaily-编号、标题、推荐语、条目标题或推荐人"
47+
placeholder="搜索期数、标题、推荐语、条目标题或推荐人"
4548
autocomplete="off"
4649
/>
47-
<p>支持期数编号、<code>geekdaily-1915</code>、标题、推荐语、推荐人和条目标题关键词。</p>
4850
</div>
4951

5052
<div class="card quick-filter-panel">
51-
{featuredTags.length > 0 && (
52-
<div>
53-
<p class="panel-title">标签筛选</p>
53+
<div class="filter-stack">
54+
{featuredTags.length > 0 && (
55+
<div class="filter-block">
56+
<p class="panel-title">标签筛选</p>
57+
<div class="chip-row" role="list">
58+
{featuredTags.map((tag) => (
59+
<button
60+
type="button"
61+
class="chip-button"
62+
data-tag={tag}
63+
aria-pressed="false"
64+
aria-controls="results-list"
65+
>
66+
{tag}
67+
</button>
68+
))}
69+
</div>
70+
</div>
71+
)}
72+
<div class="filter-block">
73+
<p class="panel-title">年份筛选</p>
5474
<div class="chip-row" role="list">
55-
{featuredTags.map((tag) => (
75+
{years.slice(0, 6).map((year) => (
5676
<button
5777
type="button"
58-
class="chip-button"
59-
data-tag={tag}
78+
class="chip-button muted"
79+
data-year={year}
6080
aria-pressed="false"
6181
aria-controls="results-list"
6282
>
63-
{tag}
83+
{year}
6484
</button>
6585
))}
6686
</div>
6787
</div>
68-
)}
69-
<div>
70-
<p class="panel-title">年份筛选</p>
71-
<div class="chip-row" role="list">
72-
{years.slice(0, 6).map((year) => (
73-
<button
74-
type="button"
75-
class="chip-button muted"
76-
data-year={year}
77-
aria-pressed="false"
78-
aria-controls="results-list"
79-
>
80-
{year}
81-
</button>
82-
))}
83-
</div>
8488
</div>
8589
<button type="button" class="reset-button" id="reset-filters" aria-controls="results-list">清空筛选</button>
8690
</div>
@@ -689,7 +693,7 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
689693
.quick-filter-panel,
690694
.episode-list :global(.episode-card),
691695
.pager {
692-
padding: 1.2rem;
696+
padding: 1rem 1.05rem;
693697
}
694698

695699
.panel-title,
@@ -721,19 +725,27 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
721725
.controls-grid {
722726
display: grid;
723727
grid-template-columns: 1.15fr 1fr;
724-
gap: 1rem;
728+
gap: 0.85rem;
725729
}
726730

727731
.search-panel {
728732
display: grid;
729-
gap: 0.9rem;
733+
gap: 0.65rem;
734+
align-content: start;
730735
background:
731736
linear-gradient(180deg, rgba(255, 255, 255, 0.96), rgba(240, 249, 246, 0.88));
732737
}
733738

739+
.search-head {
740+
display: flex;
741+
align-items: center;
742+
justify-content: space-between;
743+
gap: 0.75rem;
744+
}
745+
734746
.search-panel input {
735747
width: 100%;
736-
padding: 1rem 1.05rem;
748+
padding: 0.88rem 1rem;
737749
border: 1px solid rgba(31, 41, 51, 0.12);
738750
border-radius: 1rem;
739751
background: rgba(255, 255, 255, 0.82);
@@ -742,23 +754,34 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
742754

743755
.quick-filter-panel {
744756
display: grid;
745-
gap: 1rem;
746-
align-content: start;
757+
grid-template-columns: minmax(0, 1fr) auto;
758+
gap: 0.85rem;
759+
align-items: end;
747760
background:
748761
linear-gradient(180deg, rgba(255, 255, 255, 0.96), rgba(255, 249, 239, 0.9));
749762
}
750763

764+
.filter-stack {
765+
display: grid;
766+
gap: 0.7rem;
767+
}
768+
769+
.filter-block {
770+
display: grid;
771+
gap: 0.4rem;
772+
}
773+
751774
.chip-row {
752775
display: flex;
753776
flex-wrap: wrap;
754-
gap: 0.6rem;
755-
margin-top: 0.85rem;
777+
gap: 0.5rem;
778+
margin-top: 0;
756779
}
757780

758781
.chip-button,
759782
.reset-button,
760783
.pager button {
761-
padding: 0.75rem 0.95rem;
784+
padding: 0.68rem 0.9rem;
762785
border: 0;
763786
border-radius: 999px;
764787
cursor: pointer;
@@ -788,6 +811,10 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
788811
font-weight: 700;
789812
}
790813

814+
.reset-button {
815+
white-space: nowrap;
816+
}
817+
791818
.results-head,
792819
.pager {
793820
display: flex;
@@ -916,6 +943,11 @@ Astro.response.headers.set('Cache-Control', 'public, max-age=300, stale-while-re
916943
grid-template-columns: 1fr;
917944
}
918945

946+
.quick-filter-panel {
947+
grid-template-columns: 1fr;
948+
align-items: start;
949+
}
950+
919951
.episode-list :global(.episode-card ul) {
920952
columns: 1;
921953
}

‎apps/web/src/pages/index.astro‎

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const featuredContributors = contributors.slice(0, 2);
1414
const liveWire = feed.dynamicFeed.slice(0, 6);
1515
const recentGeekDaily = feed.recentGeekDaily.slice(0, 3);
1616
const frontPageHighlights = liveWire.slice(0, 3);
17-
const featuredSignals = site.homeSignals.slice(0, 2);
1817
1918
const liveWireTypeLabel = {
2019
article: '文章',
@@ -47,18 +46,6 @@ const liveWireTypeLabel = {
4746
</a>
4847
))}
4948
</div>
50-
<div class="hero-footnotes">
51-
<article>
52-
<span>双域名入口</span>
53-
<strong>{site.primaryDomain.replace('https://', '')}</strong>
54-
<p>默认内容主域名,第二域名保留社区入口一致性。</p>
55-
</article>
56-
<article>
57-
<span>公开阅读</span>
58-
<strong>无需登录</strong>
59-
<p>读者直接访问,管理侧通过专用后台维护结构化内容。</p>
60-
</article>
61-
</div>
6249
</article>
6350

6451
<aside class="signal-panel card live-desk">
@@ -67,7 +54,6 @@ const liveWireTypeLabel = {
6754
title="正在发生什么"
6855
description="用一条实时更新的社区新闻线,把文章、活动、GeekDaily 和招聘放在同一个阅读入口里。"
6956
/>
70-
<p class="desk-note">右侧保留更高频的更新视图,左侧则负责建立对 Rebase 的第一印象和内容主张。</p>
7157
<ol class="live-wire-list">
7258
{liveWire.map((item) => (
7359
<li class="live-wire-item">
@@ -82,15 +68,6 @@ const liveWireTypeLabel = {
8268
</li>
8369
))}
8470
</ol>
85-
<div class="signal-list signal-compact">
86-
{featuredSignals.map((signal) => (
87-
<a class="signal-item" href={signal.href}>
88-
<p>{signal.eyebrow}</p>
89-
<h3>{signal.title}</h3>
90-
<span>{signal.summary}</span>
91-
</a>
92-
))}
93-
</div>
9471
</aside>
9572
</section>
9673

@@ -340,46 +317,6 @@ const liveWireTypeLabel = {
340317
line-height: 1.65;
341318
}
342319

343-
.hero-footnotes {
344-
display: grid;
345-
grid-template-columns: repeat(2, minmax(0, 1fr));
346-
gap: 0.9rem;
347-
margin-top: 1.5rem;
348-
}
349-
350-
.hero-footnotes article {
351-
padding: 1rem;
352-
border-radius: 1rem;
353-
background: rgba(255, 255, 255, 0.62);
354-
border: 1px solid rgba(31, 41, 51, 0.08);
355-
}
356-
357-
.hero-footnotes span,
358-
.hero-footnotes strong,
359-
.hero-footnotes p {
360-
display: block;
361-
margin: 0;
362-
}
363-
364-
.hero-footnotes span {
365-
color: var(--accent-strong);
366-
font-size: 0.72rem;
367-
font-weight: 800;
368-
letter-spacing: 0.14em;
369-
text-transform: uppercase;
370-
}
371-
372-
.hero-footnotes strong {
373-
margin-top: 0.45rem;
374-
font-size: 1.05rem;
375-
}
376-
377-
.hero-footnotes p {
378-
margin-top: 0.45rem;
379-
color: var(--muted);
380-
line-height: 1.65;
381-
}
382-
383320
.live-desk {
384321
display: grid;
385322
gap: 1rem;
@@ -410,13 +347,6 @@ const liveWireTypeLabel = {
410347
box-shadow: 0 14px 28px rgba(0, 0, 0, 0.12);
411348
}
412349

413-
.desk-note {
414-
margin: -0.25rem 0 0;
415-
color: rgba(223, 244, 238, 0.74);
416-
font-size: 0.95rem;
417-
line-height: 1.7;
418-
}
419-
420350
.live-wire-list {
421351
display: grid;
422352
gap: 0.85rem;
@@ -480,31 +410,6 @@ const liveWireTypeLabel = {
480410
line-height: 1.65;
481411
}
482412

483-
.signal-compact {
484-
grid-template-columns: repeat(2, minmax(0, 1fr));
485-
}
486-
487-
.signal-compact .signal-item {
488-
background: rgba(255, 255, 255, 0.08);
489-
border-color: rgba(223, 244, 238, 0.12);
490-
}
491-
492-
.signal-compact .signal-item:hover,
493-
.signal-compact .signal-item:focus-visible {
494-
background: rgba(255, 255, 255, 0.14);
495-
border-color: rgba(243, 196, 110, 0.3);
496-
box-shadow: 0 16px 32px rgba(0, 0, 0, 0.14);
497-
}
498-
499-
.signal-compact .signal-item p,
500-
.signal-compact .signal-item h3 {
501-
color: white;
502-
}
503-
504-
.signal-compact .signal-item span {
505-
color: rgba(223, 244, 238, 0.7);
506-
}
507-
508413
.current-desk {
509414
padding-top: 1.9rem;
510415
}
@@ -565,10 +470,8 @@ const liveWireTypeLabel = {
565470
}
566471

567472
@media (max-width: 960px) {
568-
.hero-footnotes,
569473
.hero-highlights,
570-
.dispatch-grid,
571-
.signal-compact {
474+
.dispatch-grid {
572475
grid-template-columns: 1fr;
573476
}
574477

‎apps/web/src/pages/who-is-hiring/index.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const jobLeadPoints = [
6464
];
6565
---
6666

67-
<BaseLayout site={site} title="社区招聘" description="查看 Rebase 社区当前公开的招聘信息与岗位详情。">
67+
<BaseLayout site={site} title="Who-Is-Hiring | Rebase社区招聘" description="查看 Rebase 社区当前公开的招聘信息与岗位详情。">
6868
<ListPageHero
6969
kicker="社区招聘"
7070
edition="Opportunity Board"

0 commit comments

Comments
 (0)