Skip to content

Commit 374f1eb

Browse files
parkerbxyzparkerbxyz
committed
Update to latest version of Primer
1 parent f7c83b2 commit 374f1eb

File tree

11 files changed

+98
-608
lines changed

11 files changed

+98
-608
lines changed

‎_includes/breadcrumbs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</li>
3939
{% endif %}
4040
{% if forloop.last %}
41-
<liclass="breadcrumb-item breadcrumb-item-selected text-gray" aria-current="page">
41+
<liclass="breadcrumb-item breadcrumb-item-selected color-fg-muted" aria-current="page">
4242
{{page.title }}
4343
</li>
4444
{% else %}
@@ -52,4 +52,4 @@
5252
{% endif %}
5353
{% endfor %}
5454
</ol>
55-
</nav>
55+
</nav>

‎_includes/footer.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<footerclass="bg-gray-light border-top py-4 text-gray text-center mt-6 flex-none">
1+
<footerclass="color-bg-subtle border-top py-4 color-fg-muted text-center mt-6 flex-none">
22
<spanaria-label="Made with love by GitHub and friends">
3-
<ahref="https://github.com/{{site.gh_repo }}" class="text-gray-dark mb-2">
3+
<ahref="https://github.com/{{site.gh_repo }}" class="color-fg-default mb-2">
44
Made with :heart: by :octocat:s and friends
55
</a>
66
</span>
77
<divclass="d-flex flex-justify-center text-uppercase text-bold my-1">
8-
<ahref="{{site.baseurl }}/feed.xml" aria-label="Feed xml" class="d-flex flex-items-center text-gray text-uppercase mr-4">
9-
<divclass="d-flex mr-1">{% octicon rss %}</div>
8+
<ahref="{{site.baseurl }}/feed.xml" aria-label="Feed xml" class="d-flex flex-items-center color-fg-muted text-uppercase mr-4">
9+
<divclass="d-flex mr-1">{% octicon rss %}</div>
1010
{{site.data.ui-text[site.locale].feed_label }}
1111
</a>
12-
<ahref="https://github.community" class="d-flex flex-items-center text-gray text-uppercase"><divclass="d-flex mr-1">{% octicon organization %}</div> Community</a>
12+
<ahref="https://github.community" class="d-flex flex-items-center color-fg-muted text-uppercase"><divclass="d-flex mr-1">{% octicon organization %}</div> Community</a>
1313
</div>
14-
15-
<p>&copy;{{site.time | date: '%Y' }}{{site.name }}{{site.data.ui-text[site.locale].powered_by }} <ahref="https://jekyllrb.com" rel="nofollow" class="text-gray-dark">Jekyll</a> &amp;
16-
<ahref="https://github.com/primer/primer-css" rel="nofollow" class="text-gray-dark">Primer</a>.
14+
15+
<p>&copy;{{site.time | date: '%Y' }}{{site.name }}{{site.data.ui-text[site.locale].powered_by }} <ahref="https://jekyllrb.com" rel="nofollow" class="color-fg-default">Jekyll</a> &amp;
16+
<ahref="https://github.com/primer/primer-css" rel="nofollow" class="color-fg-default">Primer</a>.
1717
</p>
1818
</footer>

‎_includes/header.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
{% endif %}
66
{% assign nav = site.data.navigation["main"][lang] %}
77

8-
<divclass="bg-blue-darker py-3 f5 flex-none text-white">
8+
<divclass="bg-blue-darker py-3 f5 flex-none color-fg-on-emphasis">
99
<headerclass="container-lg p-responsive site-header js-site-header d-block clearfix">
10-
<aclass="no-underline text-inherit text-bold d-flex flex-items-center lh-condensed-ultra float-left" href="{{site.baseurl }}/{{site.data.navigation['banner'][lang].url}}" aria-label="Git Cheat Sheets Main Page">
10+
<aclass="no-underline color-fg-inherit text-bold d-flex flex-items-center lh-condensed-ultra float-left" href="{{site.baseurl }}/{{site.data.navigation['banner'][lang].url}}" aria-label="Git Cheat Sheets Main Page">
1111
<divclass="mr-3">{% octicon mark-github %}</div>
1212
{{site.data.navigation["banner"][lang].title }}
1313
</a>
@@ -19,7 +19,7 @@
1919
<navclass="site-header-menu float-none float-md-right py-1 mt-4 mt-md-0">
2020
<ulclass="d-block d-md-flex list-style-none">
2121
{% for link in nav %}
22-
<liclass="ml-0 ml-md-3"><aclass="text-inherit py-3 py-md-0 d-block" href="{% if link.abs %}{{link.abs}}{% else %}{{site.baseurl }}{{link.url }}{% endif %}">{{link.title }}</a></li>
22+
<liclass="ml-0 ml-md-3"><aclass="color-fg-inherit py-3 py-md-0 d-block" href="{% if link.abs %}{{link.abs}}{% else %}{{site.baseurl }}{{link.url }}{% endif %}">{{link.title }}</a></li>
2323
{% endfor %}
2424
</ul>
2525
</nav>

‎_includes/light-hero.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<divclass="border-bottom border-top py-6 bg-gray-light text-center">
1+
<divclass="border-bottom border-top py-6 color-bg-subtle text-center">
22
<divclass="container-lg py-6 p-responsive">
33
<h1>{{page.title }}</h1>
44
{% if page.description %}

‎assets/_scss/curriculum.scss‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@mixinocticon-link($char){
33
font: normalnormal1em octicons;
44
text-decoration: none;
5-
color: $blue;
5+
color: var(--color-text-link);
66

77
&:after{
88
content: $char;
@@ -48,7 +48,7 @@
4848
}
4949

5050
.display-controls{
51-
border-top: solid2px$gray-200;
51+
border-top: solid2pxvar(--color-border-primary);
5252
margin-top: 5px;
5353
padding-top: 10px;
5454
}
@@ -67,13 +67,13 @@
6767
width: 0;
6868

6969
&:checked + label{
70-
color: $blue;
70+
color: var(--color-text-blue);
7171

7272
&:before{
7373
content: '\f046';
74-
color: rgba($gray-100, 1);
75-
background-color: $gray-300;
76-
box-shadow: 0001px$gray-300;
74+
color: rgba(var(--color-scale-gray-1), 1);
75+
background-color: var(--color-scale-gray-3);
76+
box-shadow: 0001pxvar(--color-scale-gray-3);
7777
padding-left: 0px;
7878
line-height: 14px;
7979
}
@@ -91,11 +91,11 @@
9191
left: 0;
9292
display: inline-block;
9393
border-radius: 50%;
94-
color: rgba($gray-300, 0);
94+
color: rgba(var(--color-scale-gray-3), 0);
9595
-webkit-transition: all180ms;
9696
width: 14px;
9797
height: 14px;
98-
box-shadow: 0001px$gray-300;
98+
box-shadow: 0001pxvar(--color-scale-gray-3);
9999
}
100100
}
101101

@@ -105,13 +105,13 @@
105105
width: 0;
106106

107107
&:checked + label{
108-
color: $gray-300;
108+
color: var(--color-scale-gray-3);
109109

110110
&:before{
111111
content: '\f03a';
112-
color: rgba($gray-100, 1);
113-
background-color: $gray-300;
114-
box-shadow: 0001px$gray-300;
112+
color: rgba(var(--color-scale-gray-1), 1);
113+
background-color: var(--color-scale-gray-3);
114+
box-shadow: 0001pxvar(--color-scale-gray-3);
115115
padding-left: 0px;
116116
line-height: 1em;
117117
}
@@ -129,12 +129,12 @@
129129
left: 0;
130130
display: inline-block;
131131
border-radius: 50%;
132-
color: rgba($gray-300, 0);
132+
color: rgba(var(--color-scale-gray-3), 0);
133133
-webkit-transition: all180ms;
134134
padding-left: 5px;
135135
width: 14px;
136136
height: 14px;
137-
box-shadow: 0001px$gray-300;
137+
box-shadow: 0001pxvar(--color-scale-gray-3);
138138
line-height: .2em;
139139
}
140140
}
@@ -180,7 +180,7 @@
180180
position: relative;
181181
font: 13px/1.4Helvetica, arial, freesans, clean, sans-serif;
182182
font-weight: 300;
183-
color: $gray-900;
183+
color: var(--color-scale-gray-9);
184184

185185
h1,h2,h3,h4,h5,h6,p,ul,li{
186186
font-weight: inherit;
@@ -196,7 +196,7 @@
196196
}
197197
p,ul{
198198
font-size: 20px;
199-
color: $gray;
199+
color: var(--color-text-gray);
200200
}
201201

202202
.objectives{
@@ -224,7 +224,7 @@
224224
width: 20px;
225225
margin: 10px;
226226
border-radius: 50%;
227-
box-shadow: 0002px$gray-100;
227+
box-shadow: 0002pxvar(--color-scale-gray-1);
228228
}
229229
}
230230

@@ -233,22 +233,22 @@
233233

234234
&:before{
235235
content: "\f03a";
236-
color: $blue;
236+
color: var(--color-text-blue);
237237
}
238238
}
239239
}
240240

241241
// Custom Octicon styling
242242
.mega-octicon{
243243
font-size: 110px;
244-
color: $blue;
244+
color: var(--color-text-blue);
245245

246246
&:after{
247247
content: "";
248248
display: block;
249249
width: 170px;
250250
height: 170px;
251-
border: solid1px$gray-300;
251+
border: solid1pxvar(--color-border-tertiary);
252252
border-radius: 50%;
253253
padding: 20px;
254254
margin-top: -142px;
@@ -258,7 +258,7 @@
258258

259259
#teacher{
260260
.octicon{
261-
color: $blue;
261+
color: var(--color-text-blue);
262262
}
263263
span{
264264
margin: auto4px;
@@ -302,8 +302,8 @@
302302
font-size: 120%;
303303
text-align: left;
304304
margin: 0auto;
305-
background: $gray-900;
306-
color: $gray-100;
305+
background: var(--color-bg-canvas-inverse);
306+
color: var(--color-scale-gray-1);
307307

308308
code{
309309
font-size: 1.5em;

‎assets/_scss/github_contribution_graph.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.contribution_graph{
22
font-size: $font-size-small;
3-
color: $gray-700;
3+
color: var(--color-scale-gray-7);
44
padding: $spacer-2;
55
border-radius: 4px;
6-
border: 1pxsolid$gray-300;
6+
border: 1pxsolidvar(--color-border-tertiary);
77
}
88

99
.svg-tip{

‎assets/_scss/timeline.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
left: 40px;
1313
width: 2px;
1414
margin-left: -1.5px;
15-
background-color: $gray-200;
15+
background-color: var(--color-scale-gray-2);
1616
}
1717

1818
.timeline-image{
@@ -89,11 +89,11 @@
8989
width: 80px;
9090
height: 80px;
9191
margin-left: 0;
92-
border: 4pxsolid$gray-200;
92+
border: 4pxsolidvar(--color-border-primary);
9393
border-radius: 100%;
9494
text-align: center;
95-
color: $white;
96-
background-color: $white;
95+
color: var(--color-text-white);
96+
background-color: var(--color-bg-primary);
9797
}
9898

9999
.timeline>lip{

‎assets/css/main.scss‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
redirect_to: false
33
---
44

5-
@import"primer-core/index.scss";
6-
@import"primer-product/index.scss";
7-
@import"primer-marketing/index.scss";
5+
@import"@primer/css/index.scss";
86

97
@import"timeline";
108
@import"curriculum";
@@ -21,11 +19,11 @@ details.flash{
2119
}
2220

2321
.bg-blue-dark{
24-
background-color: $blue-600!important;
22+
background-color: var(--color-scale-blue-6)!important;
2523
}
2624

2725
.bg-blue-darker{
28-
background-color: $blue-700!important;
26+
background-color: var(--color-scale-blue-7)!important;
2927
}
3028

3129
.octicon{fill: currentColor}
@@ -36,7 +34,7 @@ details.flash{
3634

3735
.site-header-menu{
3836
li{
39-
border-bottom: 1pxsolid$gray-300;
37+
border-bottom: 1pxsolidvar(--color-border-tertiary);
4038

4139
@includebreakpoint(md){
4240
border-bottom: none;
@@ -55,13 +53,23 @@ details.flash{
5553

5654
h1, h2, h3, h4, h5, h6{
5755
-webkit-font-smoothing: antialiased;
58-
font-family: $alt-body-font;
56+
font-family: $font-mktg;
5957
}
6058

61-
h1{@includealt-h1}
59+
@mixinh1-mktg{
60+
font-size: $h1-size-mobile!important;
61+
@includebreakpoint(md){font-size: $h1-size!important}
62+
}
63+
64+
h1{@includeh1-mktg}
65+
66+
@mixinh2-mktg{
67+
font-size: $h2-size-mobile!important;
68+
@includebreakpoint(md){font-size: $h2-size!important}
69+
}
6270

6371
h2{
64-
@includealt-h2;
72+
@includeh2-mktg;
6573
margin-top: $spacer-6;
6674
margin-bottom: $spacer-3;
6775
line-height: 1.25;
@@ -73,8 +81,13 @@ details.flash{
7381
}
7482
}
7583

84+
@mixinh3-mktg{
85+
font-size: $h3-size-mobile!important;
86+
@includebreakpoint(md){font-size: $h3-size!important}
87+
}
88+
7689
h3{
77-
@includealt-h3;
90+
@includeh3-mktg;
7891
margin-top: $spacer-4;
7992
margin-bottom: $spacer-3;
8093

@@ -111,10 +124,10 @@ details.flash{
111124

112125
@media (max-width: $width-md){
113126
display: flex;
114-
color: $gray-400;
127+
color: var(--color-scale-gray-4);
115128

116129
&:hover{
117-
color: $gray-300;
130+
color: var(--color-scale-gray-3);
118131
}
119132
}
120133
}
@@ -129,7 +142,7 @@ details.flash{
129142
transition: box-shadow0.2sease-in-out;
130143

131144
&:hover{
132-
box-shadow: $box-shadow-large;
145+
box-shadow: var(--color-shadow-large);
133146
text-decoration: none;
134147
}
135148
}

‎index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
redirect_from:
77
- /kit/downloads/git-github-cheat-sheet.pdf/
88
- /kit/downloads/subversion-migration.pdf/
9-
breadcrumbColor: "bg-gray-light"
9+
breadcrumbColor: "color-bg-subtle"
1010
redirect_to: false
1111
---
12-
<divclass="border-bottom border-top py-6 bg-gray-light text-center">
12+
<divclass="border-bottom border-top py-6 color-bg-subtle text-center">
1313
<divclass="container-lg py-6 p-responsive">
1414
<h1>{{page.title }}</h1>
1515
{% if page.description %}<pclass="col-12 col-md-6 mx-auto">{{page.description }}</p>{% endif %}
@@ -20,7 +20,7 @@ <h1>{{page.title }}</h1>
2020
<divclass="container-md mx-auto d-flex flex-wrap p-responsive gutter mt-6">
2121
<divclass="col-12 col-md-6 mb-4 mb-md-0">
2222
<divstyle="width: 128px;">{% include icon-sm-git.svg %}</div>
23-
<h2class="mt-2">Using Git</h2>
23+
<h2class="mt-2">Git Cheat Sheets</h2>
2424
<ulclass="list-style-none">
2525
<li><aclass="d-flex flex-items-center" href="{{site.baseurl }}/downloads/az/github-git-cheat-sheet/"><spanclass="d-flex mr-2">{% octicon download %}</span> Azərbaycanca</a></li>
2626
<li><aclass="d-flex flex-items-center" href="{{site.baseurl }}/downloads/ar/github-git-cheat-sheet/"><spanclass="d-flex mr-2">{% octicon download %}</span> عربى</a></li>

0 commit comments

Comments
(0)