Skip to content

Commit 3f3d942

Browse files
authored
Merge pull request #24 from traP-jp/welcome2025版作成
Welcome2025版作成
2 parents 0ef1871 + f05772a commit 3f3d942

Some content is hidden

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

42 files changed

+1314
-1570
lines changed

docs/.vitepress/config.mts

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { defineConfig } from 'vitepress'
22

33
// https://vitepress.dev/reference/site-config
44
export default defineConfig({
5-
title: 'Git講習会 実習テキスト',
5+
title: 'Git 講習会',
66
description: 'traPで行われたGit講習会で使うためのテキストです',
77
markdown: {
88
theme: {
@@ -12,34 +12,55 @@ export default defineConfig({
1212
},
1313
themeConfig: {
1414
// https://vitepress.dev/reference/default-theme-config
15+
search: {
16+
provider: 'local'
17+
},
1518
nav: [{ text: 'Home', link: '/' }],
1619

17-
sidebar: {
18-
'/basic': [
19-
{
20-
text: '基礎編',
21-
items: [
22-
{ text: '準備', link: '/basic/introduction.md' },
23-
{ text: '変更をコミットする', link: '/basic/commit' },
24-
{ text: 'プルリクエストを出す', link: '/basic/pr' },
25-
{ text: '補足説明', link: '/basic/supplement' },
26-
{ text: 'おまけ1: CLIによるGit操作', link: '/basic/cli' },
27-
{ text: 'おまけ2: SSHの設定', link: '/basic/ssh' },
28-
{ text: 'おまけ3: .gitignore', link: '/basic/gitignore' },
29-
{ text: 'おまけ4: 修正コミット', link: '/basic/commit-amend' },
30-
{ text: 'おまけ5: 現在の状況を確認する', link: '/basic/status' },
31-
{ text: 'おまけ6: 容量の大きいファイルを扱う', link: '/basic/lfs' },
32-
{ text: 'おまけ7: 変更をコミットせず保存する', link: '/basic/stash' },
33-
{ text: 'おまけ8: コミットを整理する', link: '/basic/rebase' },
34-
{ text: 'おまけ9: コミットに印をつける', link: '/basic/tag' },
35-
{ text: 'おまけ10: 一部のコミットだけ取り込む', link: '/basic/cherry-pick' },
36-
{ text: 'おまけ11: 変更を消して過去に戻る', link: '/basic/reset' },
37-
{ text: 'おまけ12: 使い方を見る', link: '/basic/help' },
38-
{ text: 'おまけ13: VSCode以外のGUI操作', link: '/basic/github-desktop' }
39-
]
40-
}
41-
]
42-
},
20+
sidebar: [
21+
{
22+
text: '前編 - Git 個人開発',
23+
link: '/text/chapter-1/',
24+
items: [
25+
{
26+
text: '事前準備',
27+
collapsed: false,
28+
items: [
29+
{ text: '必要なツール', link: '/text/chapter-1/requirements' },
30+
{ text: 'SSH キーの登録', link: '/text/chapter-1/gitea-ssh' }
31+
]
32+
},
33+
{ text: 'CLI と GUI', link: '/text/chapter-1/cli-and-gui' },
34+
{ text: 'リポジトリの作成', link: '/text/chapter-1/make-repo' },
35+
{ text: 'コミットと同期', link: '/text/chapter-1/commit-and-sync' },
36+
{ text: 'ブランチ', link: '/text/chapter-1/branch' },
37+
{ text: 'Git の操作の実体', link: '/text/chapter-1/git-commands' }
38+
]
39+
},
40+
{
41+
text: '後編 - Git 共同開発',
42+
link: '/text/chapter-2/',
43+
items: [
44+
{ text: 'リポジトリ', link: '/text/chapter-2/repository' },
45+
{ text: 'ブランチを生やす', link: '/text/chapter-2/grow-a-branch' },
46+
{ text: 'プルリクエストのマージ', link: '/text/chapter-2/merge' },
47+
{ text: '共同開発の基本', link: '/text/chapter-2/team-development' },
48+
{
49+
text: '発展',
50+
collapsed: false,
51+
items: [
52+
{ text: 'コンフリクトの解決', link: '/text/chapter-2/conflict' },
53+
{ text: 'マージのしくみ', link: '/text/chapter-2/how-merging-works' },
54+
{ text: '共同開発のすすめ', link: '/text/chapter-2/best-practice' }
55+
]
56+
}
57+
]
58+
},
59+
{
60+
text: 'あとがき',
61+
link: '/text/afterword'
62+
}
63+
],
4364

4465
socialLinks: [{ icon: 'github', link: 'https://github.com/traP-jp/git-lecture' }]
4566
}

docs/.vitepress/theme/custom.css

Whitespace-only changes.

docs/.vitepress/theme/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import DefaultTheme from 'vitepress/theme'
2-
import './trap.css'
2+
import './custom.css'
33

44
export default DefaultTheme

0 commit comments

Comments
 (0)