Skip to content

Commit 70c06cf

Browse files
committed
Add keyboard lesson navigation and refine evidence hierarchy
1 parent 66450ed commit 70c06cf

4 files changed

Lines changed: 332 additions & 11 deletions

File tree

‎ideas.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@
7575
- Verification Green は、検証ノード、assertion、成功状態、主要な「検証を始める」導線に限定し、カテゴリや受動的なメタデータには使わない。
7676
- 教材ページでは Source/Test のコード比較面を最大の証拠オブジェクトとし、常に中央の検証トレースでつなぐ。
7777
- 右余白は装飾画像ではなく、番号付きの証拠ノート、ファイル参照、または検証トレースに用いる。
78+
- 初見の画面では、題名よりSource/Testの作業台が主たる証拠オブジェクトとして読める大きさと余白を優先する。
79+
- Verification Green(#B6F04A)は検証トレース、チェック、assertion、観測結果、主要な検証操作に限定し、受動的なコンテナ境界と現在地表示には中立的なコードインク色を用いる。
80+
- 解説部は番号・細線・ノードでSource/Testと結果へ接続した証拠ノートとして扱い、独立した記事カードに見せない。
Lines changed: 99 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,102 @@
11
---
22
/** Design system: 証明の作業台 — source/test panels are the evidence table, joined by a verification trace. */
3-
import CodePanel from "./CodePanel.astro"; const {sourceFilename,testFilename,source,test}=Astro.props;
3+
import CodePanel from "./CodePanel.astro";
4+
5+
const { sourceFilename, testFilename, source, test } = Astro.props;
46
---
5-
<section class="comparison" aria-label="Source と Test のコード比較"><CodePanel kind="Source" filename={sourceFilename} code={source}/><i><span>Source</span>✓<span>Test</span></i><CodePanel kind="Test" filename={testFilename} code={test}/></section><style>/* Design system: 証明の作業台 — green exists only as a central, verified source-to-test contract. */.comparison{position:relative;display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:2px;border:1px solid rgba(182,240,74,.48);background:rgba(182,240,74,.48);box-shadow:0 1.6rem 3rem rgba(0,0,0,.24)}.comparison:before{position:absolute;z-index:3;top:0;bottom:0;left:50%;width:1px;background:rgba(182,240,74,.85);content:""}.comparison>i{position:absolute;z-index:4;top:3.42rem;left:50%;display:grid;grid-template-columns:auto 1.55rem auto;align-items:center;gap:.35rem;color:var(--green);font-family:var(--code);font-size:.57rem;font-style:normal;letter-spacing:.06em;text-transform:uppercase;transform:translate(-50%,-50%)}.comparison>i:before,.comparison>i:after{width:1.5rem;height:1px;background:rgba(182,240,74,.68);content:""}.comparison>i span{display:none}.comparison>i{font-size:.72rem}.comparison>i::before{grid-column:1}.comparison>i::after{grid-column:3}.comparison>i{width:auto}.comparison>i{line-height:1}.comparison>i{color:var(--green)}.comparison>i{background:var(--ink);border:1px solid rgba(182,240,74,.7);border-radius:50%;display:grid;width:1.55rem;height:1.55rem;place-items:center}.comparison>i:before,.comparison>i:after{position:absolute;top:50%;background:rgba(182,240,74,.72)}.comparison>i:before{right:100%}.comparison>i:after{left:100%}@media(max-width:780px){.comparison{grid-template-columns:1fr}.comparison:before{top:50%;right:0;bottom:auto;left:0;width:auto;height:1px}.comparison>i{top:50%;right:1.1rem;left:auto;transform:translateY(-50%)}}</style>
7+
8+
<section class="comparison" aria-label="Source と Test のコード比較">
9+
<CodePanel kind="Source" filename={sourceFilename} code={source} />
10+
<i><span>Source</span>✓<span>Test</span></i>
11+
<CodePanel kind="Test" filename={testFilename} code={test} />
12+
</section>
13+
14+
<style>
15+
/* Design system: 証明の作業台 — neutral workbench edges recede; verification green exists only on the central trace. */
16+
.comparison {
17+
position: relative;
18+
display: grid;
19+
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
20+
gap: 2px;
21+
border: 1px solid var(--line);
22+
background: var(--line);
23+
box-shadow: 0 1.6rem 3rem rgba(0, 0, 0, 0.24);
24+
}
25+
26+
.comparison:before {
27+
position: absolute;
28+
z-index: 3;
29+
top: 0;
30+
bottom: 0;
31+
left: 50%;
32+
width: 1px;
33+
background: rgba(182, 240, 74, 0.85);
34+
content: "";
35+
}
36+
37+
.comparison > i {
38+
position: absolute;
39+
z-index: 4;
40+
top: 3.42rem;
41+
left: 50%;
42+
display: grid;
43+
width: 1.55rem;
44+
height: 1.55rem;
45+
place-items: center;
46+
border: 1px solid rgba(182, 240, 74, 0.7);
47+
border-radius: 50%;
48+
background: var(--ink);
49+
color: var(--green);
50+
font-family: var(--code);
51+
font-size: 0.72rem;
52+
font-style: normal;
53+
line-height: 1;
54+
letter-spacing: 0.06em;
55+
text-transform: uppercase;
56+
transform: translate(-50%, -50%);
57+
}
58+
59+
.comparison > i span {
60+
display: none;
61+
}
62+
63+
.comparison > i:before,
64+
.comparison > i:after {
65+
position: absolute;
66+
top: 50%;
67+
width: 1.5rem;
68+
height: 1px;
69+
background: rgba(182, 240, 74, 0.72);
70+
content: "";
71+
}
72+
73+
.comparison > i:before {
74+
right: 100%;
75+
}
76+
77+
.comparison > i:after {
78+
left: 100%;
79+
}
80+
81+
@media (max-width: 780px) {
82+
.comparison {
83+
grid-template-columns: 1fr;
84+
}
85+
86+
.comparison:before {
87+
top: 50%;
88+
right: 0;
89+
bottom: auto;
90+
left: 0;
91+
width: auto;
92+
height: 1px;
93+
}
94+
95+
.comparison > i {
96+
top: 50%;
97+
right: 1.1rem;
98+
left: auto;
99+
transform: translateY(-50%);
100+
}
101+
}
102+
</style>

‎src/components/Sidebar.astro‎

Lines changed: 223 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
/** Design system: 証明の作業台 — サブパス配下でも証拠への導線を切らない固定ナビゲーション。 */
2+
/** Design system: 証明の作業台 — a fixed navigation rail preserves context without borrowing verification green for passive state. */
33
import { navigation } from "../data/lessons";
44
import { withBase } from "../lib/links";
55
@@ -8,5 +8,225 @@ const { currentPath } = Astro.props;
88
const lessonCount = navigation.reduce((total, group) => total + group.items.length, 0);
99
---
1010

11-
<aside id="sidebar"><div><a class="brand" href={withBase()}><span class="brand-mark" aria-hidden="true"><i></i></span><span><small>Executable Documentation</small><strong>JAVA/<b>TESTS</b></strong></span></a><nav><a class:list={["root",{active:currentPath==="/"}]} href={withBase()}>Getting Started</a>{navigation.map(group=><section><h2>{group.label}</h2>{group.items.map(lesson=>{const logicalHref=`/java/${lesson.slug}`;return <a class:list={[{active:currentPath===logicalHref}]} href={withBase(logicalHref)}>{lesson.title.replace(/^(String|ArrayList|List\.of|record|Optional|Stream): /,"")}</a>})}</section>)}</nav></div><footer><i></i>Java 21 / JUnit 5 <span>{String(lessonCount).padStart(2,"0")} lessons</span></footer></aside>
12-
<style>/* Design system: 証明の作業台 — the bracket/check mark makes the source-to-proof contract ownable. */aside{position:sticky;top:0;display:flex;height:100vh;flex-direction:column;justify-content:space-between;border-right:1px solid var(--line);background:#0a0f11}aside>div{overflow:auto;padding:1.45rem 1rem 1rem}.brand{display:flex;align-items:center;gap:.75rem;padding:.2rem .45rem 1.55rem;border-bottom:1px solid var(--line)}.brand-mark{position:relative;display:inline-block;width:2.45rem;height:2.45rem;border:2px solid var(--paper);border-top-color:rgba(239,245,242,.44);border-bottom-color:rgba(239,245,242,.44)}.brand-mark:before,.brand-mark:after{position:absolute;top:.5rem;bottom:.5rem;width:2px;background:var(--paper);content:""}.brand-mark:before{left:.52rem}.brand-mark:after{right:.52rem}.brand-mark i{position:absolute;z-index:1;top:.9rem;left:.8rem;width:.86rem;height:.46rem;border-bottom:3px solid var(--green);border-left:3px solid var(--green);transform:rotate(-45deg)}.brand span+span{display:grid;line-height:1}.brand small{margin-bottom:.32rem;color:var(--dim);font-family:var(--code);font-size:.54rem;letter-spacing:.07em;text-transform:uppercase}.brand strong{font-family:var(--display);font-size:.88rem;letter-spacing:.07em}.brand b{color:var(--green)}nav{padding-top:1.15rem}.root,section a{display:block;border-left:2px solid transparent;color:var(--muted);transition:color 160ms var(--ease),background 160ms var(--ease),border-color 160ms var(--ease)}.root{margin-bottom:1.15rem;padding:.5rem .55rem;font-family:var(--display);font-size:.86rem;font-weight:600}section{margin-top:1.15rem}section h2{margin:0 0 .35rem .58rem;color:var(--dim);font-family:var(--code);font-size:.63rem;font-weight:500;letter-spacing:.1em;text-transform:uppercase}section a{padding:.42rem .55rem;font-size:.8rem}.root:hover,section a:hover,.active{border-left-color:var(--green)!important;background:rgba(182,240,74,.07);color:var(--paper)!important}footer{display:grid;grid-template-columns:auto 1fr auto;align-items:center;gap:.45rem;padding:.85rem 1rem;border-top:1px solid var(--line);color:var(--dim);font-family:var(--code);font-size:.58rem}footer i{width:.42rem;height:.42rem;border-radius:50%;background:var(--green)}@media(max-width:840px){aside{position:fixed;z-index:40;left:0;width:min(18.5rem,86vw);height:100dvh;transform:translateX(-104%);box-shadow:1rem 0 2.5rem #000;transition:transform 220ms var(--ease)}aside.open{transform:translateX(0)}}</style>
11+
<aside id="sidebar">
12+
<div>
13+
<a class="brand" href={withBase()}>
14+
<span class="brand-mark" aria-hidden="true"><i></i></span>
15+
<span>
16+
<small>Executable Documentation</small>
17+
<strong><span>JAVA</span><em>/</em><b>TESTS</b></strong>
18+
</span>
19+
</a>
20+
<nav>
21+
<a class:list={["root", { active: currentPath === "/" }]} href={withBase()}>Getting Started</a>
22+
{
23+
navigation.map((group) => (
24+
<section>
25+
<h2>{group.label}</h2>
26+
{
27+
group.items.map((lesson) => {
28+
const logicalHref = `/java/${lesson.slug}`;
29+
return (
30+
<a class:list={[{ active: currentPath === logicalHref }]} href={withBase(logicalHref)}>
31+
{lesson.title.replace(/^(String|ArrayList|List\.of|record|Optional|Stream): /, "")}
32+
</a>
33+
);
34+
})
35+
}
36+
</section>
37+
))
38+
}
39+
</nav>
40+
</div>
41+
<footer><i></i>Java 21 / JUnit 5 <span>{String(lessonCount).padStart(2, "0")} lessons</span></footer>
42+
</aside>
43+
44+
<style>
45+
/* Design system: 証明の作業台 — the bracket/check mark is the ownable brand signal; green stays reserved for verified evidence. */
46+
aside {
47+
position: sticky;
48+
top: 0;
49+
display: flex;
50+
height: 100vh;
51+
flex-direction: column;
52+
justify-content: space-between;
53+
border-right: 1px solid var(--line);
54+
background: #0a0f11;
55+
}
56+
57+
aside > div {
58+
overflow: auto;
59+
padding: 1.45rem 1rem 1rem;
60+
}
61+
62+
.brand {
63+
display: flex;
64+
align-items: center;
65+
gap: 0.75rem;
66+
padding: 0.2rem 0.45rem 1.55rem;
67+
border-bottom: 1px solid var(--line);
68+
}
69+
70+
.brand-mark {
71+
position: relative;
72+
display: inline-block;
73+
width: 2.55rem;
74+
height: 2.55rem;
75+
border: 2px solid var(--paper);
76+
border-top-color: rgba(239, 245, 242, 0.5);
77+
border-bottom-color: rgba(239, 245, 242, 0.5);
78+
box-shadow: inset 0 0 0 1px rgba(14, 21, 24, 0.9);
79+
}
80+
81+
.brand-mark:before,
82+
.brand-mark:after {
83+
position: absolute;
84+
top: 0.5rem;
85+
bottom: 0.5rem;
86+
width: 2px;
87+
background: var(--paper);
88+
content: "";
89+
}
90+
91+
.brand-mark:before {
92+
left: 0.52rem;
93+
}
94+
95+
.brand-mark:after {
96+
right: 0.52rem;
97+
}
98+
99+
.brand-mark i {
100+
position: absolute;
101+
z-index: 1;
102+
top: 0.93rem;
103+
left: 0.84rem;
104+
width: 0.86rem;
105+
height: 0.46rem;
106+
border-bottom: 3px solid var(--green);
107+
border-left: 3px solid var(--green);
108+
transform: rotate(-45deg);
109+
}
110+
111+
.brand span + span {
112+
display: grid;
113+
gap: 0.18rem;
114+
line-height: 1;
115+
}
116+
117+
.brand small {
118+
color: var(--dim);
119+
font-family: var(--code);
120+
font-size: 0.54rem;
121+
letter-spacing: 0.1em;
122+
text-transform: uppercase;
123+
}
124+
125+
.brand strong {
126+
display: flex;
127+
align-items: baseline;
128+
color: var(--paper);
129+
font-family: var(--display);
130+
font-size: 0.92rem;
131+
letter-spacing: 0.115em;
132+
}
133+
134+
.brand strong span {
135+
font-weight: 400;
136+
}
137+
138+
.brand strong em {
139+
margin: 0 0.04em;
140+
color: var(--dim);
141+
font-style: normal;
142+
font-weight: 400;
143+
}
144+
145+
.brand b {
146+
color: var(--green);
147+
font-weight: 700;
148+
}
149+
150+
nav {
151+
padding-top: 1.15rem;
152+
}
153+
154+
.root,
155+
section a {
156+
display: block;
157+
border-left: 2px solid transparent;
158+
color: var(--muted);
159+
transition: color 160ms var(--ease), background 160ms var(--ease), border-color 160ms var(--ease);
160+
}
161+
162+
.root {
163+
margin-bottom: 1.15rem;
164+
padding: 0.5rem 0.55rem;
165+
font-family: var(--display);
166+
font-size: 0.86rem;
167+
font-weight: 600;
168+
}
169+
170+
section {
171+
margin-top: 1.15rem;
172+
}
173+
174+
section h2 {
175+
margin: 0 0 0.35rem 0.58rem;
176+
color: var(--dim);
177+
font-family: var(--code);
178+
font-size: 0.63rem;
179+
font-weight: 500;
180+
letter-spacing: 0.1em;
181+
text-transform: uppercase;
182+
}
183+
184+
section a {
185+
padding: 0.42rem 0.55rem;
186+
font-size: 0.8rem;
187+
}
188+
189+
.root:hover,
190+
section a:hover,
191+
.active {
192+
border-left-color: var(--bright) !important;
193+
background: rgba(145, 177, 186, 0.08);
194+
color: var(--paper) !important;
195+
}
196+
197+
footer {
198+
display: grid;
199+
grid-template-columns: auto 1fr auto;
200+
align-items: center;
201+
gap: 0.45rem;
202+
padding: 0.85rem 1rem;
203+
border-top: 1px solid var(--line);
204+
color: var(--dim);
205+
font-family: var(--code);
206+
font-size: 0.58rem;
207+
}
208+
209+
footer i {
210+
width: 0.42rem;
211+
height: 0.42rem;
212+
border-radius: 50%;
213+
background: var(--bright);
214+
}
215+
216+
@media (max-width: 840px) {
217+
aside {
218+
position: fixed;
219+
z-index: 40;
220+
left: 0;
221+
width: min(18.5rem, 86vw);
222+
height: 100dvh;
223+
transform: translateX(-104%);
224+
box-shadow: 1rem 0 2.5rem #000;
225+
transition: transform 220ms var(--ease);
226+
}
227+
228+
aside.open {
229+
transform: translateX(0);
230+
}
231+
}
232+
</style>

‎src/pages/java/[...slug].astro‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,16 @@ const { lesson } = Astro.props;
7272

7373
<style>
7474
/* Design system: 証明の作業台 — expected/actual is concrete evidence, while tags stay quiet metadata. */
75-
article { max-width: 90rem; margin: 0 auto; padding: clamp(3.4rem, 6vw, 6.2rem) clamp(1.25rem, 4vw, 4.5rem) 5rem; }
76-
.lesson-head { display: flex; align-items: flex-end; justify-content: space-between; gap: 2rem; padding-bottom: 2.2rem; }
77-
.lesson-head h1 { max-width: 16ch; margin: .8rem 0 0; font-family: var(--display); font-size: clamp(2.25rem, 4.4vw, 4.65rem); font-weight: 600; letter-spacing: -.078em; line-height: .98; }
75+
article { max-width: 90rem; margin: 0 auto; padding: clamp(2.6rem, 4.8vw, 4.8rem) clamp(1.25rem, 4vw, 4.5rem) 5rem; }
76+
.lesson-head { display: flex; align-items: flex-end; justify-content: space-between; gap: 2rem; padding-bottom: 1.45rem; }
77+
.lesson-head h1 { max-width: 20ch; margin: .8rem 0 0; font-family: var(--display); font-size: clamp(2rem, 3.55vw, 3.85rem); font-weight: 600; letter-spacing: -.072em; line-height: 1; }
7878
.lesson-head p:not(.eyebrow) { max-width: 41rem; margin: 1.15rem 0 0; color: var(--muted); font-size: .96rem; }
7979
.meta { display: grid; justify-items: end; gap: .65rem; padding-bottom: .3rem; color: var(--dim); font-family: var(--code); font-size: .61rem; letter-spacing: .05em; text-transform: uppercase; white-space: nowrap; }
8080
.tags { display: flex; max-width: 15rem; flex-wrap: wrap; justify-content: flex-end; gap: .28rem; }
8181
.tags span { padding: .12rem .28rem; border: 1px solid var(--line); color: var(--muted); font-size: .52rem; letter-spacing: .06em; text-transform: lowercase; }
82-
.evidence { display: grid; grid-template-columns: 6.5rem minmax(0, 1fr) minmax(10rem, 16rem); gap: clamp(1.5rem, 4vw, 4rem); margin-top: 3.6rem; padding: 2rem 0; border-bottom: 1px solid var(--line); }
83-
.margin { display: grid; align-content: start; gap: .35rem; color: var(--dim); font-family: var(--code); font-size: .61rem; letter-spacing: .08em; text-transform: uppercase; }
82+
.evidence { position: relative; display: grid; grid-template-columns: 6.5rem minmax(0, 1fr) minmax(10rem, 16rem); gap: clamp(1.5rem, 4vw, 4rem); margin-top: 2.6rem; padding: 2rem 0; border-top: 1px solid var(--line); border-bottom: 1px solid var(--line); }
83+
.margin { position: relative; display: grid; align-content: start; gap: .35rem; padding-right: 1rem; border-right: 1px solid var(--line); color: var(--dim); font-family: var(--code); font-size: .61rem; letter-spacing: .08em; text-transform: uppercase; }
84+
.margin:after { position: absolute; top: .18rem; right: -.25rem; width: .48rem; height: .48rem; border: 1px solid var(--green); border-radius: 50%; background: var(--ink); content: ""; }
8485
.margin b { color: var(--green); }
8586
.evidence h2 { margin: 0; font-family: var(--display); font-size: 1.15rem; letter-spacing: -.04em; }
8687
.evidence ul { display: grid; gap: .35rem; margin: 1rem 0 1.15rem; padding: 0; list-style: none; }
@@ -98,5 +99,5 @@ const { lesson } = Astro.props;
9899
.proof-card i { position: relative; z-index: 1; display: grid; width: 1.4rem; height: 1.4rem; place-items: center; border: 1px solid var(--green); border-radius: 50%; background: var(--ink); color: var(--green); font-style: normal; }
99100
.proof-card p { margin: 0 !important; overflow: hidden; color: var(--paper) !important; font-family: var(--code); font-size: .58rem !important; text-overflow: ellipsis; white-space: nowrap; }
100101
@media (max-width: 900px) { .evidence { grid-template-columns: 5rem minmax(0, 1fr); } .proof-card { display: none; } }
101-
@media (max-width: 640px) { article { padding-top: 3rem; } .lesson-head { align-items: flex-start; flex-direction: column; gap: 1rem; } .meta { justify-items: start; } .tags { justify-content: flex-start; max-width: none; } .evidence { grid-template-columns: 1fr; gap: 1rem; } .margin { grid-auto-flow: column; justify-content: start; gap: .6rem; } }
102+
@media (max-width: 640px) { article { padding-top: 3rem; } .lesson-head { align-items: flex-start; flex-direction: column; gap: 1rem; } .meta { justify-items: start; } .tags { justify-content: flex-start; max-width: none; } .evidence { grid-template-columns: 1fr; gap: 1rem; } .margin { grid-auto-flow: column; justify-content: start; gap: .6rem; padding-right: 0; padding-bottom: .65rem; border-right: 0; border-bottom: 1px solid var(--line); } .margin:after { top: auto; right: .18rem; bottom: -.25rem; } }
102103
</style>

0 commit comments

Comments
 (0)