Skip to content

Commit 79e718e

Browse files
brabojclaude
andauthored
docs: rename chapter names and fix tab labels (#126)
* docs: rename Subprojects to Nested Repositories, fix tab labels (#112) - Rename chapter 5: Subprojects -> Nested Repositories (file, title, section) - Fix tab labels: Branching -> Branching & Merging, Remotes -> Remote Repos, Expert -> Expert Topics, Subprojects -> Nested Repos - Update all cross-references in README, CLAUDE.md, glossary, onboarding Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: hide horizontal scrollbar on tab navigation Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use flex-wrap instead of overflow scroll for tabs Prevents horizontal scrollbar flash on page load. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: reduce tab padding and letter-spacing to fit in one row Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add overflow hidden to tabs bar to prevent scrollbar flash Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: inline overflow hidden on tabs bar to prevent FOUC scrollbar Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: shorten Introduction tab to Intro, restore original padding Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: use smaller tab padding for 10-tab layout Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * style: add thin border separators between tab links Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * style: redesign tabs with folder-tab appearance Active tab connects to page content with matching background and rounded top corners. Inactive tabs stay in the bar. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * revert: go back to simple tab style with accent underline Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 5d60ca4 commit 79e718e

10 files changed

Lines changed: 16 additions & 17 deletions

File tree

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ chapters/ # SSG-agnostic tutorial content (canonical)
3434
02-building-blocks.md
3535
03-branching-and-merging.md
3636
04-remote-repositories.md
37-
05-subprojects.md
37+
05-nested-repositories.md
3838
06-expert-topics.md
3939
07-playbook.md
4040
08-appendix.md

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ directory.
3535
| 2 | [Building Blocks](chapters/02-building-blocks.md) | Repositories, objects, references, HEAD, tags |
3636
| 3 | [Branching and Merging](chapters/03-branching-and-merging.md) | Branches, merge strategies, rebase, cherry-pick, conflicts, stash |
3737
| 4 | [Remote Repositories](chapters/04-remote-repositories.md) | Clone, push, pull, fetch, remote tracking, forking workflows |
38-
| 5 | [Subprojects](chapters/05-subprojects.md) | Submodules and subtrees |
38+
| 5 | [Nested Repositories](chapters/05-nested-repositories.md) | Submodules and subtrees |
3939
| 6 | [Expert Topics](chapters/06-expert-topics.md) | Configuration, selectors, refspecs, hooks, bisect |
4040
| 7 | [Playbook](chapters/07-playbook.md) | Step-by-step recipes for common tasks |
4141
| 8 | [Appendix](chapters/08-appendix.md) | Merge strategies, SSH setup, Git clients, references |

astro-site/src/components/Header.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const base = import.meta.env.BASE_URL;
3030
</header>
3131
</div>
3232

33-
<div class="site-tabs-bar">
33+
<div class="site-tabs-bar" style="overflow:hidden">
3434
<button class="nav-toggle" id="nav-toggle" aria-label="Open navigation menu" aria-expanded="false">
3535
<svg class="nav-toggle-icon" viewBox="0 0 24 24" width="22" height="22" fill="currentColor" aria-hidden="true">
3636
<path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>

astro-site/src/data/site.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"repo": "https://github.com/braboj/tutorial-git",
66
"tabs": [
77
{ "label": "Home", "href": "/" },
8-
{ "label": "Introduction", "href": "/introduction/" },
8+
{ "label": "Intro", "href": "/introduction/" },
99
{ "label": "Building Blocks", "href": "/building-blocks/" },
10-
{ "label": "Branching", "href": "/branching-and-merging/" },
11-
{ "label": "Remotes", "href": "/remote-repositories/" },
12-
{ "label": "Subprojects", "href": "/subprojects/" },
13-
{ "label": "Expert", "href": "/expert-topics/" },
10+
{ "label": "Branching & Merging", "href": "/branching-and-merging/" },
11+
{ "label": "Remote Repos", "href": "/remote-repositories/" },
12+
{ "label": "Nested Repos", "href": "/nested-repositories/" },
13+
{ "label": "Expert Topics", "href": "/expert-topics/" },
1414
{ "label": "Playbook", "href": "/playbook/" },
1515
{ "label": "Appendix", "href": "/appendix/" },
1616
{ "label": "Glossary", "href": "/glossary/" }

astro-site/src/pages/index.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const headings = [
7272
<td>Clone, push, pull, fetch, remote tracking, forking workflows</td>
7373
</tr>
7474
<tr>
75-
<td><a href={`${base}subprojects/`}>Subprojects</a></td>
75+
<td><a href={`${base}nested-repositories/`}>Nested Repositories</a></td>
7676
<td>Submodules and subtrees for managing dependencies</td>
7777
</tr>
7878
<tr>

astro-site/src/styles/global.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ a:hover {
267267
.site-tabs {
268268
display: flex;
269269
padding: 0 var(--space-md);
270-
overflow-x: auto;
271270
max-width: calc(var(--max-content) + 2 * var(--sidebar-width) + 2 * var(--space-xl));
272271
margin: 0 auto;
273272
}
@@ -278,7 +277,7 @@ a:hover {
278277
font-weight: 500;
279278
text-transform: uppercase;
280279
letter-spacing: 0.04em;
281-
padding: 0 var(--space-md);
280+
padding: 0 var(--space-sm);
282281
height: var(--tab-height);
283282
display: flex;
284283
align-items: center;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: "Subprojects"
3-
section: "subprojects"
2+
title: "Nested Repositories"
3+
section: "nested-repositories"
44
order: 5
55
---
66

chapters/09-glossary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ A reference of key Git terms used throughout this tutorial, with links to the ch
4949
| Revert | Create a new commit that undoes a previous commit's changes without rewriting history | [7](07-playbook.md) |
5050
| Squash merge | Combine all commits from a branch into a single change set on the target branch — no merge commit | [3](03-branching-and-merging.md) |
5151
| Stash | Save uncommitted changes temporarily so you can switch branches with a clean working tree | [3](03-branching-and-merging.md) |
52-
| Submodule | A reference to a specific commit in another repository — stores URL and hash, not files | [5](05-subprojects.md) |
53-
| Subtree | A full copy of another repository merged into a subdirectory of the parent project | [5](05-subprojects.md) |
52+
| Submodule | A reference to a specific commit in another repository — stores URL and hash, not files | [5](05-nested-repositories.md) |
53+
| Subtree | A full copy of another repository merged into a subdirectory of the parent project | [5](05-nested-repositories.md) |
5454
| Tag | A named reference to a commit — annotated (object with metadata) or lightweight (plain reference) | [2](02-building-blocks.md) |
5555
| Tree | Object that represents a directory — lists blobs and other trees with names and permissions | [2](02-building-blocks.md) |
5656
| Upstream | Conventional name for the original repository you forked from | [4](04-remote-repositories.md) |

docs/ONBOARDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ files for the web version.
7171
02-building-blocks.md 07-playbook.md
7272
03-branching-and-merging.md 08-appendix.md
7373
04-remote-repositories.md 09-glossary.md
74-
05-subprojects.md
74+
05-nested-repositories.md
7575
```
7676

7777
Chapter structure, writing conventions, and figure style rules are

docs/dev-journal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Architecture overview and chronological session log for tutorial-git.
7474
02-building-blocks.md
7575
03-branching-and-merging.md
7676
04-remote-repositories.md ← NEW
77-
05-subprojects.md ← NEW (split from deep internals)
77+
05-nested-repositories.md ← NEW (split from deep internals)
7878
06-expert-topics.md ← renamed, overhauled
7979
07-playbook.md ← rewritten as recipes
8080
08-appendix.md ← trimmed + SSH

0 commit comments

Comments
 (0)