Skip to content

Commit 3921dc2

Browse files
author
Matthew McCullough
committed
Merge branch 'master' into enhance-foundations-outlines-cheat
2 parents eb395d3 + d834a06 commit 3921dc2

25 files changed

+2132
-1675
lines changed

‎Rakefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ task :clean do
66
end
77

88
task :test do
9-
sh 'bundle exec sass _stylesheets/cheatsheet.scss:_stylesheets/cheatsheet.css'
10-
sh 'bundle exec sass _stylesheets/materials.scss:_stylesheets/materials.css'
9+
sh 'bundle exec sass _stylesheets/home.scss:_stylesheets/home.css'
1110
sh 'bundle exec sass _stylesheets/outline.scss:_stylesheets/outline.css'
12-
sh 'bundle exec sass _stylesheets/page.scss:_stylesheets/page.css'
13-
sh 'bundle exec sass _stylesheets/slide.scss:_stylesheets/slide.css'
11+
1412
sh 'bundle exec jekyll build'
1513

1614
# HTML::Proofer.new("./_site").run

‎_layouts/bare.html

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,44 @@
1111
{% endif %}
1212
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
1313

14-
<link rel="stylesheet" media="screen" href="_stylesheets/materials.css" type="text/css" />
14+
<link rel="stylesheet"
15+
media="screen"
16+
href=
17+
{% if page.theme %}
18+
{% if page.theme != "home" %}
19+
"../_stylesheets/{{ page.theme }}.css"
20+
{% else %}
21+
"_stylesheets/{{ page.theme }}.css"
22+
{% endif %}
23+
{% else %}
24+
"_stylesheets/default.css"
25+
{% endif %}
26+
type="text/css" />
1527

1628
{% include analytics.html %}
1729
</head>
1830
<body>
31+
{% if page.path != "index.html" %}
32+
<header>
33+
<div class="container">
34+
<nav>
35+
<ul>
36+
<li><a class="button" href="https://training.github.com">Join an Event</a></li>
37+
</ul>
38+
</nav>
39+
<a href="../">
40+
<div class="logo-group">
41+
<div class="logo">
42+
<span class="octicon octicon-logo-github"></span>
43+
<span class="logo-training-materials"></span>
44+
</div>
45+
<div class="description">Return to Home</div>
46+
</div>
47+
</a>
48+
</div>
49+
</header>
50+
{% endif %}
51+
1952
{{ content }}
2053
</body>
2154
</html>

‎_layouts/cheatsheet.html

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<title>{% if page.title %}{{ page.title }} • {% endif %}{{ site.title }}</title>
5-
{% if page.description %}
6-
<meta name="description" content="{{ page.description }}" />
7-
{% endif %}
8-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
1+
---
2+
layout: bare
3+
theme: outline
4+
---
95

10-
<link rel="stylesheet" media="screen" href="/_stylesheets/cheatsheet.css" type="text/css" />
6+
<section class="hero">
7+
<div class="container">
8+
<span class="octicon octicon-file-text"></span><h1>{{ page.title }}</h1>
9+
</div>
10+
</section>
11+
<section>
12+
<div class="container">
13+
{{ content }}
14+
</div>
15+
</section>
1116

12-
{% include analytics.html %}
13-
</head>
14-
<body>
15-
<div class="top">
16-
<header>
17-
<div class="logo"><a href ="/">GitHub Training</a></div>
18-
<a href="https://github.com/github/training-materials" class="mini-button"><span>R</span>Source on GitHub</a>
19-
</header>
20-
</div>
21-
22-
<div id="content-wrapper">
23-
<h1>{{ page.title }}</h1>
24-
{{ content }}
25-
</div>
26-
</body>
27-
</html>
17+
{% include footer.html %}

‎_layouts/outline.html

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
---
22
layout: bare
3+
theme: outline
34
---
45

5-
<h1>{{ page.title }}</h1>
6-
{{ content }}
6+
<section class="hero">
7+
<div class="container">
8+
<span class="octicon octicon-book"></span><h1>{{ page.title }}</h1>
9+
</div>
10+
</section>
11+
<section>
12+
<div class="container">
13+
{{ content }}
14+
</div>
15+
</section>
16+
17+
{% include footer.html %}

‎_stylesheets/colors.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Color Definitions */

‎_stylesheets/colors.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* Color Definitions */
2+
$color-dark: #1875c6;
3+
$color-bright: #00a5ea;

‎_stylesheets/core.css

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
h1 {
2+
font-size: 46px;
3+
font-weight: 200;
4+
text-rendering: optimizeLegibility; }
5+
6+
h2 {
7+
font-size: 200%;
8+
line-height: 150%;
9+
color: #222; }
10+
11+
h2 + p {
12+
font-size: 125%;
13+
font-weight: 200;
14+
text-rendering: optimizeLegibility;
15+
line-height: 150%;
16+
opacity: .65;
17+
margin: auto auto 20px auto; }
18+
19+
h3 {
20+
font-size: 125%;
21+
margin: 20px 0 0 0;
22+
color: #222; }
23+
24+
p {
25+
text-rendering: optimizeLegibility;
26+
line-height: 150%; }
27+
28+
header {
29+
background: #fff;
30+
color: #ddd;
31+
padding: 15px; }
32+
header a {
33+
color: #d9d9d9; }
34+
header a:hover {
35+
color: #d9d9d9; }
36+
header a:hover .logo {
37+
margin-top: -32px;
38+
opacity: 0; }
39+
header nav {
40+
float: right;
41+
font-size: 14px;
42+
line-height: 26px; }
43+
header nav ul li {
44+
display: inline-block;
45+
margin-left: 10px; }
46+
header nav .button {
47+
padding: 8px;
48+
border: solid 1px #eee;
49+
border-radius: 5px; }
50+
header .octicon {
51+
font-size: 26px; }
52+
header .logo-training-materials {
53+
display: inline-block;
54+
height: 20px;
55+
width: 178px; }
56+
header .logo-training-materials:before {
57+
content: "";
58+
background: url(../images/training-materials-dark-2x.png) no-repeat top left;
59+
background-size: contain;
60+
height: 24px;
61+
width: 178px;
62+
display: block;
63+
opacity: .15; }
64+
65+
section {
66+
width: 100%;
67+
float: left; }
68+
69+
code {
70+
font-family: "Courier New", Courier, monospace;
71+
color: #63b83e;
72+
border-radius: 3px; }
73+
74+
pre {
75+
width: 100%;
76+
background: #222;
77+
line-height: 140%;
78+
margin: 30px 0;
79+
border-radius: 3px; }
80+
pre code {
81+
display: block;
82+
padding: 10px; }
83+
84+
table {
85+
width: 100%;
86+
background: #eee;
87+
line-height: 140%;
88+
margin: 30px 0;
89+
padding: 20px;
90+
border-radius: 3px;
91+
border-spacing: 0; }
92+
table th {
93+
font-size: 18px;
94+
font-weight: 200;
95+
text-align: left;
96+
border-bottom: solid 1px #bfbfbf;
97+
opacity: .5;
98+
padding: 0 0 10px; }
99+
100+
ul {
101+
margin: 0 0 0 1.5em; }
102+
103+
.container {
104+
width: 830px;
105+
margin: 40px auto auto;
106+
position: relative; }
107+
header .container {
108+
margin: 0 auto; }
109+
110+
.center {
111+
text-align: center; }
112+
113+
.logo-group {
114+
height: 25px;
115+
overflow: hidden; }
116+
.logo-group .description {
117+
line-height: 32px; }
118+
119+
.logo {
120+
-webkit-transition: margin 600ms, opacity 300ms;
121+
transition: margin 600ms, opacity 300ms; }

0 commit comments

Comments
 (0)