Skip to content

Commit 236fbbc

Browse files
author
jordanmccullough
committed
Reverse merge to bring layout back up to date
Retains the Intermediate-Advanced deck link within the confines of the new layout that matches the main training.github.com site.
2 parents 286c8db + f2cccfd commit 236fbbc

31 files changed

+2720
-775
lines changed

‎_includes/license.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
<div class="license">
2-
<a href="../license.html">Shared with the community under a Creative Commons license</a>
3-
</div>
1+
<a href="../license.html">Shared with the community under a Creative Commons license</a>

‎_includes/navigation.html

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
1-
<section class="colorful">
2-
<nav>
3-
<hgroup>
4-
<a href="https://training.github.com">
5-
<span class="mega-octicon octicon-logo-github"></span>
6-
<span class="logo-training"></span>
7-
</a>
8-
</hgroup>
9-
<ul>
10-
<li><a href="../">Materials</a></li>
11-
<li><a class="button" href="https://training.github.com">Join an Event</a></li>
12-
</ul>
13-
</nav>
14-
</section>
1+
<header class="colorful">
2+
<div class="container">
3+
<h1 id="logo" class="content">
4+
<a href="{{ site.url }}/" data-escp="">GitHub Training</a>
5+
</h1>
6+
<nav id="nav">
7+
<ul class="content">
8+
<li>
9+
<a href="https://training.github.com/trainers/">Trainers</a>
10+
</li>
11+
<li>
12+
<a href="https://training.github.com/web/">Web-based</a>
13+
</li>
14+
<li>
15+
<a href="https://training.github.com/in-person/">In-person</a>
16+
</li>
17+
<li class="current">
18+
<a href="https://training.github.com/kit/">Kit</a>
19+
</li>
20+
<li>
21+
<a href="https://training.github.com/resources/">Resources</a>
22+
</li>
23+
<li>
24+
<a href="https://training.github.com/contact/">Contact</a>
25+
</li>
26+
</ul>
27+
</nav>
28+
</div>
29+
</header>

‎_layouts/bare.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@
4343
{% endif %}
4444
</head>
4545
<body>
46-
{% if page.path != "index.html" %}
47-
{% include navigation.html %}
48-
{% endif %}
46+
{% include navigation.html %}
4947

5048
{{ content }}
5149
</body>

‎_layouts/license.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
layout: bare
3+
---
4+
5+
<section class="hero overview">
6+
<div class="container">
7+
<div class="content">
8+
<h2>{{ page.title }}</h2>
9+
<p>&nbsp;</p>
10+
</div>
11+
</div>
12+
</section>
13+
14+
15+
<section>
16+
<div class="container">
17+
{{ content }}
18+
</div>
19+
</section>
20+
21+
{% include footer.html %}

‎_layouts/workbook.html

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
theme: workbook
44
---
55

6-
<section class="hero center">
6+
<section class="hero overview">
77
<div class="container">
8-
<!-- <span class="octicon octicon-book"></span> -->
9-
<h1>{{ page.title }}</h1>
10-
{% include license.html %}
11-
12-
{% if page.description %}
13-
<br/>
14-
<div class="description">{{ page.description }}</div>
15-
{% endif %}
8+
<div class="content">
9+
<h2>{{ page.title }}</h2>
10+
<p>{% include license.html %}</p>
11+
</div>
1612
</div>
1713
</section>
1814

19-
<section>
15+
<section class="workbook">
2016
<div class="container">
2117

2218
<div class="tab-panel">
@@ -37,13 +33,11 @@ <h1>{{ page.title }}</h1>
3733
</label>
3834
</div>
3935

40-
<!-- <nav class="toc">
41-
TOC
42-
</nav> -->
43-
44-
<span id="scope">
45-
{{ content }}
46-
</span>
36+
<div class="content">
37+
<span id="scope">
38+
{{ content }}
39+
</span>
40+
</div>
4741
</div>
4842
</section>
4943

0 commit comments

Comments
 (0)