Skip to content

Commit 0de29ad

Browse files
brntbeerbrntbeer
authored
Merge pull request #114 from git/site-baseurl-for-proper-asset-paths
Site baseurl for proper asset paths
2 parents 3d40a0f + 89872fb commit 0de29ad

File tree

13 files changed

+85
-88
lines changed

13 files changed

+85
-88
lines changed

Diff for: ‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
baseurl: /git-reference

Diff for: ‎_layouts/reference.html

+36-36
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
55
<title>Git Reference</title>
6-
<link rel="stylesheet" type="text/css" href="css/reset.css" media="screen" />
7-
<link rel="stylesheet" type="text/css" href="css/text.css" media="screen" />
8-
<link rel="stylesheet" type="text/css" href="css/grid.css" media="screen" />
9-
<link rel="stylesheet" type="text/css" href="css/layout.css" media="screen" />
10-
<link rel="stylesheet" type="text/css" href="css/nav.css" media="screen" />
11-
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="css/ie6.css" media="screen" /><![endif]-->
12-
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="css/ie.css" media="screen" /><![endif]-->
13-
<script type="text/javascript" src="js/jquery-1.4.1.min.js"></script>
14-
<script type="text/javascript" src="js/jquery-ui.min.js"></script>
15-
<script type="text/javascript" src="js/action.js"></script>
6+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/reset.css" media="screen" />
7+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/text.css" media="screen" />
8+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/grid.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/layout.css" media="screen" />
10+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/nav.css" media="screen" />
11+
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie6.css" media="screen" /><![endif]-->
12+
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie.css" media="screen" /><![endif]-->
13+
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.4.1.min.js"></script>
14+
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-ui.min.js"></script>
15+
<script type="text/javascript" src="{{ site.baseurl }}/js/action.js"></script>
1616
</head>
1717
<body>
1818
<div class="container_12">
@@ -23,9 +23,9 @@
2323

2424
<div class="grid_12">
2525
<ul id="menu">
26-
<li><a id="menu_home" href="index.html">Reference</a></li>
26+
<li><a id="menu_home" href="{{ site.baseurl }}/index.html">Reference</a></li>
2727
<!-- <li><a id="menu_cookbook" href="/cookbook.html">Cookbook</a></li> -->
28-
<li><a id="menu_about" href="about.html">About</a></li>
28+
<li><a id="menu_about" href="{{ site.baseurl }}/about.html">About</a></li>
2929
<li>&#167;</li>
3030
<li><a href="https://github.com/git/git-reference">Site Source</a></li>
3131
</ul>
@@ -35,51 +35,51 @@
3535

3636
<div class="grid_2" id="reflist">
3737
<div class="block">
38-
<h3><a href="creating">Getting and Creating Projects</a></h3>
38+
<h3><a href="{{ site.baseurl }}/creating">Getting and Creating Projects</a></h3>
3939
<ul>
40-
<li><a href="creating/#init">init</a></li>
41-
<li><a href="creating/#clone">clone</a></li>
40+
<li><a href="{{ site.baseurl }}/creating/#init">init</a></li>
41+
<li><a href="{{ site.baseurl }}/creating/#clone">clone</a></li>
4242
</ul>
4343
</div>
4444

4545
<div class="block">
46-
<h3><a href="basic">Basic Snapshotting</a></h3>
46+
<h3><a href="{{ site.baseurl }}/basic">Basic Snapshotting</a></h3>
4747
<ul>
48-
<li><a href="basic/#add">add</a></li>
49-
<li><a href="basic/#status">status</a></li>
50-
<li><a href="basic/#diff">diff</a></li>
51-
<li><a href="basic/#commit">commit</a></li>
52-
<li><a href="basic/#reset">reset</a></li>
53-
<li><a href="basic/#rm-mv">rm, mv</a></li>
54-
<li><a href="basic/#stash">stash</a></li>
48+
<li><a href="{{ site.baseurl }}/basic/#add">add</a></li>
49+
<li><a href="{{ site.baseurl }}/basic/#status">status</a></li>
50+
<li><a href="{{ site.baseurl }}/basic/#diff">diff</a></li>
51+
<li><a href="{{ site.baseurl }}/basic/#commit">commit</a></li>
52+
<li><a href="{{ site.baseurl }}/basic/#reset">reset</a></li>
53+
<li><a href="{{ site.baseurl }}/basic/#rm-mv">rm, mv</a></li>
54+
<li><a href="{{ site.baseurl }}/basic/#stash">stash</a></li>
5555
</ul>
5656
</div>
5757

5858
<div class="block">
59-
<h3><a href="branching">Branching and Merging</a></h3>
59+
<h3><a href="{{ site.baseurl }}/branching">Branching and Merging</a></h3>
6060
<ul>
61-
<li><a href="branching/#branch">branch</a></li>
62-
<li><a href="branching/#branch">checkout</a></li>
63-
<li><a href="branching/#merge">merge</a></li>
64-
<li><a href="branching/#log">log</a></li>
65-
<li><a href="branching/#tag">tag</a></li>
61+
<li><a href="{{ site.baseurl }}/branching/#branch">branch</a></li>
62+
<li><a href="{{ site.baseurl }}/branching/#branch">checkout</a></li>
63+
<li><a href="{{ site.baseurl }}/branching/#merge">merge</a></li>
64+
<li><a href="{{ site.baseurl }}/branching/#log">log</a></li>
65+
<li><a href="{{ site.baseurl }}/branching/#tag">tag</a></li>
6666
</ul>
6767
</div>
6868

6969
<div class="block">
70-
<h3><a href="remotes">Sharing and Updating Projects</a></h3>
70+
<h3><a href="{{ site.baseurl }}/remotes">Sharing and Updating Projects</a></h3>
7171
<ul>
72-
<li><a href="remotes/#remote">remote</a></li>
73-
<li><a href="remotes/#fetch">fetch, pull</a></li>
74-
<li><a href="remotes/#push">push</a></li>
72+
<li><a href="{{ site.baseurl }}/remotes/#remote">remote</a></li>
73+
<li><a href="{{ site.baseurl }}/remotes/#fetch">fetch, pull</a></li>
74+
<li><a href="{{ site.baseurl }}/remotes/#push">push</a></li>
7575
</ul>
7676
</div>
7777

7878
<div class="block">
79-
<h3><a href="inspect">Inspection and Comparison</a></h3>
79+
<h3><a href="{{ site.baseurl }}/inspect">Inspection and Comparison</a></h3>
8080
<ul>
81-
<li><a href="inspect/#log">log</a></li>
82-
<li><a href="inspect/#diff">diff</a></li>
81+
<li><a href="{{ site.baseurl }}/inspect/#log">log</a></li>
82+
<li><a href="{{ site.baseurl }}/inspect/#diff">diff</a></li>
8383
</ul>
8484
</div>
8585

Diff for: ‎_layouts/zh_reference.html

+35-35
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<head>
44
<meta charset="utf-8" />
55
<title>Git 参考手册</title>
6-
<link rel="stylesheet" type="text/css" href="css/reset.css" media="screen" />
7-
<link rel="stylesheet" type="text/css" href="css/text.css" media="screen" />
8-
<link rel="stylesheet" type="text/css" href="css/grid.css" media="screen" />
9-
<link rel="stylesheet" type="text/css" href="css/layout.css" media="screen" />
10-
<link rel="stylesheet" type="text/css" href="css/nav.css" media="screen" />
11-
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="css/ie6.css" media="screen" /><![endif]-->
12-
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="css/ie.css" media="screen" /><![endif]-->
13-
<script type="text/javascript" src="js/jquery-1.4.1.min.js"></script>
14-
<script type="text/javascript" src="js/jquery-ui.min.js"></script>
15-
<script type="text/javascript" src="js/action.js"></script>
6+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/reset.css" media="screen" />
7+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/text.css" media="screen" />
8+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/grid.css" media="screen" />
9+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/layout.css" media="screen" />
10+
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/nav.css" media="screen" />
11+
<!--[if IE 6]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie6.css" media="screen" /><![endif]-->
12+
<!--[if IE 7]><link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/ie.css" media="screen" /><![endif]-->
13+
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.4.1.min.js"></script>
14+
<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-ui.min.js"></script>
15+
<script type="text/javascript" src="{{ site.baseurl }}/js/action.js"></script>
1616
</head>
1717
<body>
1818
<div class="container_12">
@@ -23,9 +23,9 @@
2323

2424
<div class="grid_12">
2525
<ul id="menu">
26-
<li><a id="menu_home" href="zh/index.html">参考手册</a></li>
26+
<li><a id="menu_home" href="{{ site.baseurl }}/zh/index.html">参考手册</a></li>
2727
<!-- <li><a id="menu_cookbook" href="zh/cookbook.html">Cookbook</a></li> -->
28-
<li><a id="menu_about" href="zh/about.html">关于</a></li>
28+
<li><a id="menu_about" href="{{ site.baseurl }}/zh/about.html">关于</a></li>
2929
<li>&#167;</li>
3030
<li><a href="https://github.com/git/git-reference">网站源码</a></li>
3131
</ul>
@@ -35,50 +35,50 @@
3535

3636
<div class="grid_2" id="reflist">
3737
<div class="block">
38-
<h3><a href="zh/creating">获取与创建项目</a></h3>
38+
<h3><a href="{{ site.baseurl }}/zh/creating">获取与创建项目</a></h3>
3939
<ul>
40-
<li><a href="zh/creating/#init">init</a></li>
41-
<li><a href="zh/creating/#clone">clone</a></li>
40+
<li><a href="{{ site.baseurl }}/zh/creating/#init">init</a></li>
41+
<li><a href="{{ site.baseurl }}/zh/creating/#clone">clone</a></li>
4242
</ul>
4343
</div>
4444

4545
<div class="block">
46-
<h3><a href="zh/basic">基本的快照</a></h3>
46+
<h3><a href="{{ site.baseurl }}/zh/basic">基本的快照</a></h3>
4747
<ul>
48-
<li><a href="zh/basic/#add">add</a></li>
49-
<li><a href="zh/basic/#status">status</a></li>
50-
<li><a href="zh/basic/#diff">diff</a></li>
51-
<li><a href="zh/basic/#commit">commit</a></li>
52-
<li><a href="zh/basic/#reset">reset</a></li>
53-
<li><a href="zh/basic/#rm-mv">rm, mv</a></li>
48+
<li><a href="{{ site.baseurl }}/zh/basic/#add">add</a></li>
49+
<li><a href="{{ site.baseurl }}/zh/basic/#status">status</a></li>
50+
<li><a href="{{ site.baseurl }}/zh/basic/#diff">diff</a></li>
51+
<li><a href="{{ site.baseurl }}/zh/basic/#commit">commit</a></li>
52+
<li><a href="{{ site.baseurl }}/zh/basic/#reset">reset</a></li>
53+
<li><a href="{{ site.baseurl }}/zh/basic/#rm-mv">rm, mv</a></li>
5454
</ul>
5555
</div>
5656

5757
<div class="block">
58-
<h3><a href="zh/branching">分支与合并</a></h3>
58+
<h3><a href="{{ site.baseurl }}/zh/branching">分支与合并</a></h3>
5959
<ul>
60-
<li><a href="zh/branching/#branch">branch</a></li>
61-
<li><a href="zh/branching/#branch">checkout</a></li>
62-
<li><a href="zh/branching/#merge">merge</a></li>
63-
<li><a href="zh/branching/#log">log</a></li>
64-
<li><a href="zh/branching/#tag">tag</a></li>
60+
<li><a href="{{ site.baseurl }}/zh/branching/#branch">branch</a></li>
61+
<li><a href="{{ site.baseurl }}/zh/branching/#branch">checkout</a></li>
62+
<li><a href="{{ site.baseurl }}/zh/branching/#merge">merge</a></li>
63+
<li><a href="{{ site.baseurl }}/zh/branching/#log">log</a></li>
64+
<li><a href="{{ site.baseurl }}/zh/branching/#tag">tag</a></li>
6565
</ul>
6666
</div>
6767

6868
<div class="block">
69-
<h3><a href="zh/remotes">分享与更新项目</a></h3>
69+
<h3><a href="{{ site.baseurl }}/zh/remotes">分享与更新项目</a></h3>
7070
<ul>
71-
<li><a href="zh/remotes/#fetch">fetch, pull</a></li>
72-
<li><a href="zh/remotes/#push">push</a></li>
73-
<li><a href="zh/remotes/#remote">remote</a></li>
71+
<li><a href="{{ site.baseurl }}/zh/remotes/#fetch">fetch, pull</a></li>
72+
<li><a href="{{ site.baseurl }}/zh/remotes/#push">push</a></li>
73+
<li><a href="{{ site.baseurl }}/zh/remotes/#remote">remote</a></li>
7474
</ul>
7575
</div>
7676

7777
<div class="block">
78-
<h3><a href="zh/inspect">检查与比较</a></h3>
78+
<h3><a href="{{ site.baseurl }}/zh/inspect">检查与比较</a></h3>
7979
<ul>
80-
<li><a href="zh/inspect/#log">log</a></li>
81-
<li><a href="zh/inspect/#diff">diff</a></li>
80+
<li><a href="{{ site.baseurl }}/zh/inspect/#log">log</a></li>
81+
<li><a href="{{ site.baseurl }}/zh/inspect/#diff">diff</a></li>
8282
</ul>
8383
</div>
8484

Diff for: ‎basic/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ <h4 id="reset-hard">
730730
dangerous option and is not working directory safe. Any changes not committed will
731731
be lost.
732732
</p>
733-
733+
734734
<pre>
735735
<b>$ git status</b>
736736
# On branch master
@@ -970,5 +970,4 @@ <h4 id="stash-drop">
970970
</div>
971971
</div>
972972

973-
<p><a class="page-button next-page" href="/branching">On to Branching and Merging &#187;</a></p>
974-
973+
<p><a class="page-button next-page" href="{{ site.baseurl }}/branching">On to Branching and Merging &#187;</a></p>

Diff for: ‎branching/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h4 id="branch-last-commit">
150150
<small>see the last commit on each branch</small>
151151
</h4>
152152

153-
<p>If we want to see last commits on each branch
153+
<p>If we want to see last commits on each branch
154154
we can run <code>git branch -v</code> to see them.</p>
155155

156156
<pre>
@@ -860,5 +860,4 @@ <h2>
860860
</div>
861861
</div>
862862

863-
<p><a class="page-button next-page" href="/remotes">On to Sharing and Updating Projects &#187;</a></p>
864-
863+
<p><a class="page-button next-page" href="{{ site.baseurl }}/remotes">On to Sharing and Updating Projects &#187;</a></p>

Diff for: ‎creating/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ <h2>
139139
</div>
140140
</div>
141141

142-
<p><a class="page-button next-page" href="/basic">On to Basic Snapshotting &#187;</a></p>
142+
<p><a class="page-button next-page" href="{{ site.baseurl }}/basic">On to Basic Snapshotting &#187;</a></p>

Diff for: ‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ <h2>How to Think Like Git</h2>
109109
</div>
110110
</div>
111111

112-
<p><a class="page-button next-page" href="/creating">On to Getting and Creating Projects &#187;</a></p>
112+
<p><a class="page-button next-page" href="{{ site.baseurl }}/creating">On to Getting and Creating Projects &#187;</a></p>

Diff for: ‎remotes/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ <h4 id="remote-rename">
151151
<small>rename remote aliases</small>
152152
</h4>
153153

154-
<p>If you want to rename remote aliases without having to delete them and add them again
154+
<p>If you want to rename remote aliases without having to delete them and add them again
155155
you can do that by running <code>git remote rename [old-alias] [new-alias]</code>. This will
156156
allow you to modify the current name of the remote.</p>
157157

@@ -437,4 +437,4 @@ <h2>
437437
</div>
438438
</div>
439439

440-
<p><a class="page-button next-page" href="/inspect">On to Inspection and Comparison &#187;</a></p>
440+
<p><a class="page-button next-page" href="{{ site.baseurl }}/inspect">On to Inspection and Comparison &#187;</a></p>

Diff for: ‎zh/basic/index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -641,5 +641,4 @@ <h4>
641641
</div>
642642
</div>
643643

644-
<p><a href="/zh/branching">到 分支与合并 &#187;</a></p>
645-
644+
<p><a href="{{ site.baseurl }}/zh/branching">到 分支与合并 &#187;</a></p>

Diff for: ‎zh/branching/index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -696,5 +696,4 @@ <h2>
696696
</div>
697697
</div>
698698

699-
<p><a href="/zh/remotes">到 分享与更新项目 &#187;</a></p>
700-
699+
<p><a href="{{ site.baseurl }}/zh/remotes">到 分享与更新项目 &#187;</a></p>

Diff for: ‎zh/creating/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ <h2>
120120
</div>
121121
</div>
122122

123-
<p><a href="/zh/basic">接下来：基本快照 &#187;</a></p>
123+
<p><a href="{{ site.baseurl }}/zh/basic">接下来：基本快照 &#187;</a></p>

Diff for: ‎zh/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ <h2>如何以 Git 的方式思考</h2>
7979
</div>
8080
</div>
8181

82-
<p><a href="/zh/creating">接下来：获取与创建项目&#187;</a></p>
82+
<p><a href="{{ site.baseurl }}/zh/creating">接下来：获取与创建项目&#187;</a></p>

Diff for: ‎zh/remotes/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,4 +318,4 @@ <h2>
318318
</div>
319319
</div>
320320

321-
<p><a href="/zh/inspect">到 检查与比较&#187;</a></p>
321+
<p><a href="{{ site.baseurl }}/zh/inspect">到 检查与比较&#187;</a></p>

0 commit comments

Comments
 (0)