Skip to content

Commit 24ba7b9

Browse files
author
Matthew McCullough
committed
Merge branch 'master' into enhance-foundations-outlines-cheat
Conflicts: cheatsheets/github-foundations.md
2 parents 3921dc2 + d270c06 commit 24ba7b9

35 files changed

+6346
-1682
lines changed

‎Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ task :clean do
66
end
77

88
task :test do
9+
sh 'bundle exec sass _stylesheets/page.scss:_stylesheets/page.css'
910
sh 'bundle exec sass _stylesheets/home.scss:_stylesheets/home.css'
1011
sh 'bundle exec sass _stylesheets/outline.scss:_stylesheets/outline.css'
1112

‎_includes/license.html

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

‎_layouts/bare.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
media="screen"
1616
href=
1717
{% if page.theme %}
18-
{% if page.theme != "home" %}
19-
"../_stylesheets/{{ page.theme }}.css"
18+
{% if page.theme == "home" %}
19+
"_stylesheets/home.css"
2020
{% else %}
21-
"_stylesheets/{{ page.theme }}.css"
21+
"../_stylesheets/{{ page.theme }}.css"
2222
{% endif %}
2323
{% else %}
24-
"_stylesheets/default.css"
24+
"_stylesheets/page.css"
2525
{% endif %}
2626
type="text/css" />
2727

‎_layouts/cheatsheet.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<section class="hero">
77
<div class="container">
88
<span class="octicon octicon-file-text"></span><h1>{{ page.title }}</h1>
9+
{% include license.html %}
910
</div>
1011
</section>
1112
<section>

‎_layouts/outline.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
<section class="hero">
77
<div class="container">
88
<span class="octicon octicon-book"></span><h1>{{ page.title }}</h1>
9+
{% include license.html %}
910
</div>
1011
</section>
12+
1113
<section>
1214
<div class="container">
1315
{{ content }}

‎_layouts/page.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
layout: bare
33
---
44

5-
<div class="top">
6-
<header>
7-
<div class="logo"><a href ="/">GitHub Training</a></div>
8-
<a href="https://github.com/github/training-materials" class="mini-button"><span>R</span>Source on GitHub</a>
9-
</header>
10-
</div>
5+
<section class="hero">
6+
<div class="container">
7+
<h1>{{ page.title }}</h1>
8+
</div>
9+
</section>
1110

12-
<div id="content-wrapper">
13-
<h1>{{ page.title }}</h1>
14-
{{ content }}
15-
</div>
11+
<section>
12+
<div class="container">
13+
{{ content }}
14+
</div>
15+
</section>
1616

1717
{% include footer.html %}

‎_stylesheets/core.css

Lines changed: 62 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,64 @@
1-
h1 {
2-
font-size: 46px;
3-
font-weight: 200;
4-
text-rendering: optimizeLegibility; }
1+
/*
2+
Syntax error: Undefined variable: "$color-bright".
3+
on line 159 of _stylesheets/core.scss
54
6-
h2 {
7-
font-size: 200%;
8-
line-height: 150%;
9-
color: #222; }
5+
154: -webkit-transition: margin 600ms, opacity 300ms;
6+
155: transition: margin 600ms, opacity 300ms;
7+
156: }
8+
157:
9+
158: .license{
10+
159: color: $color-bright;
11+
160: font-size: 12px;
12+
161:
13+
162: a{
14+
163: color: $color-bright;
15+
164: }
1016
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; }
17+
Backtrace:
18+
_stylesheets/core.scss:159
19+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/script/variable.rb:49:in `_perform'
20+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/script/node.rb:40:in `perform'
21+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:298:in `visit_prop'
22+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:37:in `visit'
23+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:100:in `visit'
24+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `block in visit_children'
25+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `map'
26+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `visit_children'
27+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:109:in `block in visit_children'
28+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:121:in `with_environment'
29+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:108:in `visit_children'
30+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:37:in `block in visit'
31+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:320:in `visit_rule'
32+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:37:in `visit'
33+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:100:in `visit'
34+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `block in visit_children'
35+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `map'
36+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:53:in `visit_children'
37+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:109:in `block in visit_children'
38+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:121:in `with_environment'
39+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:108:in `visit_children'
40+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:37:in `block in visit'
41+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:128:in `visit_root'
42+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/base.rb:37:in `visit'
43+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:100:in `visit'
44+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/visitors/perform.rb:7:in `visit'
45+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/tree/root_node.rb:20:in `render'
46+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/engine.rb:315:in `_render'
47+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/engine.rb:262:in `render'
48+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/plugin/compiler.rb:362:in `update_stylesheet'
49+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/plugin/compiler.rb:203:in `block in update_stylesheets'
50+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/plugin/compiler.rb:201:in `each'
51+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/plugin/compiler.rb:201:in `update_stylesheets'
52+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/lib/sass/plugin/compiler.rb:283:in `block in watch'
53+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/multi_listener.rb:108:in `call'
54+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/multi_listener.rb:108:in `on_change'
55+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/multi_listener.rb:117:in `block in initialize_adapter'
56+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/adapter.rb:198:in `call'
57+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/adapter.rb:198:in `report_changes'
58+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/adapter.rb:210:in `poll_changed_dirs'
59+
/Users/jmccullough/github/training-materials/vendor/gems/ruby/2.0.0/gems/sass-3.2.13/vendor/listen/lib/listen/adapters/darwin.rb:38:in `block in start'
60+
*/
61+
body:before {
62+
white-space: pre;
63+
font-family: monospace;
64+
content: "Syntax error: Undefined variable: \"$color-bright\".\A on line 159 of _stylesheets/core.scss\A \A 154: -webkit-transition: margin 600ms, opacity 300ms;\A 155: transition: margin 600ms, opacity 300ms;\A 156: }\A 157: \A 158: .license{\A 159: color: $color-bright;\A 160: font-size: 12px;\A 161: \A 162: a{\A 163: color: $color-bright;\A 164: }"; }

‎_stylesheets/core.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ h3{
2424
p{
2525
text-rendering: optimizeLegibility;
2626
line-height: 150%;
27-
// opacity: .7;
2827
}
2928
header{
3029
background: #fff;
@@ -155,3 +154,16 @@ ul{
155154
-webkit-transition: margin 600ms, opacity 300ms;
156155
transition: margin 600ms, opacity 300ms;
157156
}
157+
158+
.license{
159+
color: $color-bright;
160+
font-size: 12px;
161+
162+
a{
163+
color: $color-bright;
164+
}
165+
.container{
166+
margin: 0 auto;
167+
padding: 5px;
168+
}
169+
}

‎_stylesheets/default.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,15 @@ ul {
172172
-webkit-transition: margin 600ms, opacity 300ms;
173173
transition: margin 600ms, opacity 300ms; }
174174

175+
.license {
176+
color: #00a5ea;
177+
font-size: 12px; }
178+
.license a {
179+
color: #00a5ea; }
180+
.license .container {
181+
margin: 0 auto;
182+
padding: 5px; }
183+
175184
footer {
176185
float: left;
177186
position: relative;

‎_stylesheets/home.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,15 @@ ul {
172172
-webkit-transition: margin 600ms, opacity 300ms;
173173
transition: margin 600ms, opacity 300ms; }
174174

175+
.license {
176+
color: #00a5ea;
177+
font-size: 12px; }
178+
.license a {
179+
color: #00a5ea; }
180+
.license .container {
181+
margin: 0 auto;
182+
padding: 5px; }
183+
175184
footer {
176185
float: left;
177186
position: relative;

0 commit comments

Comments
 (0)