Skip to content

Commit 3eebbbf

Browse files
author
Jordan McCullough
committed
Merge pull request #210 from github/bootstrap-reboot
Bring Kit layout and styles up to date with Training site
2 parents 98bec4a + 58a1a12 commit 3eebbbf

Some content is hidden

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

58 files changed

+9792
-13913
lines changed

‎_includes/attention.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% if page.attention_message %}
2+
<div class="jumbotron alert alert-warning">
3+
<div class="container">
4+
{{page.attention_message | markdownify}}
5+
</div>
6+
</div>
7+
{% endif %}

‎_includes/footer.html

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
<footer class="page-footer">
1+
<footer>
22
<div class="container">
3-
<ul class="site-footer-links right">
4-
<li><a href="https://twitter.com/GitHubTraining"><span class="octicon octicon-mark-twitter"></span>@githubtraining</a></li>
5-
<li><a href="https://status.github.com">Status</a></li>
6-
<li><a href="https://github.com/blog">Blog</a></li>
7-
<li><a href="https://github.com/about">About</a></li>
8-
</ul>
3+
<div class="row">
4+
<div class="col-md-5">
5+
<ul class="text-left">
6+
<li>&copy; {{ site.time | date: '%Y' }} <span>GitHub</span>, Inc.</li>
7+
<li><a href="https://github.com/site/terms">Terms</a></li>
8+
<li><a href="https://training.github.com/kit/license.html">License</a></li>
9+
<li><a href="https://github.com/security">Security</a></li>
10+
<li><a href="https://training.github.com/contact">Contact</a></li>
11+
</ul>
12+
</div>
913

10-
<a href="/">
11-
<span class="mega-octicon octicon-mark-github"></span>
12-
</a>
14+
<div class="col-md-2">
15+
<a href="/"><span class="mega-octicon octicon-mark-github"></span></a>
16+
</div>
1317

14-
<ul class="site-footer-links">
15-
<li>&copy; {{ site.time | date: '%Y' }} <span>GitHub</span>, Inc.</li>
16-
<li><a href="https://github.com/site/terms">Terms</a></li>
17-
<li><a href="https://training.github.com/kit/license.html">License</a></li>
18-
<li><a href="https://github.com/security">Security</a></li>
19-
<li><a href="https://training.github.com/contact">Contact</a></li>
20-
</ul>
18+
<div class="col-md-5">
19+
<ul class="text-right">
20+
<li><a href="https://twitter.com/GitHubTraining"><span class="octicon octicon-mark-twitter"></span>githubtraining</a></li>
21+
<li><a href="https://status.github.com">Status</a></li>
22+
<li><a href="https://github.com/blog">Blog</a></li>
23+
<li><a href="https://github.com/about">About</a></li>
24+
</ul>
25+
</div>
26+
</div>
2127
</div>
2228
</footer>

‎_includes/navigation.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎_includes/top.html

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<header class="colorful">
2+
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-md-3 col-sm-2">
6+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-navbar-collapse">
7+
<span class="sr-only">Toggle navigation</span>
8+
<span class="icon-bar"></span>
9+
<span class="icon-bar"></span>
10+
<span class="icon-bar"></span>
11+
</button>
12+
<div id="logo"><a href="{{ site.url }}/" data-escp="">GitHub Training</a></div>
13+
</div>
14+
15+
<div class="col-md-9 col-sm-10">
16+
<div class="collapse navbar-collapse navbar-right" id="main-navbar-collapse">
17+
<ul class="nav navbar-nav navbar-right">
18+
<li><a{% if page.body_class == 'trainers' %} class="active"{% endif %} href="{{ site.url }}/trainers/">Trainers</a></li>
19+
<li><a{% if page.body_class == 'classes' %} class="active"{% endif %} href="{{ site.url }}/classes/">Classes</a></li>
20+
<li><a{% if page.body_class == 'schedule' %} class="active"{% endif %} href="{{ site.url }}/schedule/">Schedule</a></li>
21+
<li><a class="active" href="{{ site.url }}/kit/">Kit</a></li>
22+
<li><a{% if page.body_class == 'resources' %} class="active"{% endif %} href="{{ site.url }}/resources/">Resources</a></li>
23+
<li><a{% if page.body_class == 'contact' %} class="active"{% endif %} href="{{ site.url }}/contact/">Contact</a></li>
24+
</ul>
25+
</div>
26+
</div>
27+
</div>
28+
29+
{% if page.title %}
30+
<h2>{{ page.title }}</h2>
31+
{% if page.byline %}<p>{{ page.byline }}</p>{% endif %}
32+
{% endif %}
33+
34+
35+
{% if page.body_class == "home" %}
36+
<div class="jumbotron colorful classes">
37+
<div class="container text-center">
38+
39+
<div class="row">
40+
<div class="col-md-4">
41+
<a href="foundations/">
42+
<div class="panel">
43+
<span class="octicon octicon-plug"></span>
44+
<h4>Foundations</h4>
45+
<p><small>Core skills for day-to-day use of Git on the command line and GitHub workflows</small></p>
46+
</div>
47+
</a>
48+
</div>
49+
50+
<div class="col-md-4">
51+
<a href="intermediate/">
52+
<div class="panel">
53+
<span class="octicon octicon-terminal"></span>
54+
<h4>Intermediate</h4>
55+
<p><small>Important command line skills and problem solving processes</small></p>
56+
</div>
57+
</a>
58+
</div>
59+
60+
<div class="col-md-4">
61+
<a href="advanced/">
62+
<div class="panel">
63+
<span class="octicon octicon-microscope"></span>
64+
<h4>Advanced</h4>
65+
<p><small>Command line deep dive, problem solving techniques, and GitHub efficiencies</small></p>
66+
</div>
67+
</a>
68+
</div>
69+
</div>
70+
<!-- <div class="row">
71+
<div class="col-md-6">
72+
<img src="{{ site.url }}/images/git-training-pics.png" alt="GitHub Training at Live Event" class="img-responsive">
73+
</div>
74+
<div class="col-md-6">
75+
<h2>Open source teaching resources</h2>
76+
<p>Open source training content. Present your way to better version control.</p>
77+
</div>
78+
</div> -->
79+
</div>
80+
</div>
81+
{% endif %}
82+
</div>
83+
</header>

0 commit comments

Comments
 (0)