Merge pull request #934 from github/parkerbxyz/upgrade

parkerbxyz · web-flow · commit 98d43a37db6d · 2022-10-27T09:13:52.000-07:00
Update all the things
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -8,25 +8,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    # Node-specific steps
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        cache: 'npm'
     - name: Install node modules
-      run: |
-        npm install
+      run: npm install
 
-    # Ruby-specific steps
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@ece82769428359c077b5a5eaff268902a303c101
       with:
-        ruby-version: 2.6.x
+        ruby-version: '3.0'
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
     - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      run: bundle exec rake
 
-    # Jekyll-specific steps
     - name: Build the site in the jekyll/builder container
       run: |
         docker run \
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
@@ -38,7 +38,7 @@
         </li>
       {% endif %}
       {% if forloop.last %}
-        <li class="breadcrumb-item breadcrumb-item-selected text-gray" aria-current="page">
+        <li class="breadcrumb-item breadcrumb-item-selected color-fg-muted" aria-current="page">
           {{ page.title }}
         </li>
       {% else %}
@@ -52,4 +52,4 @@
       {% endif %}
     {% endfor %}
   </ol>
-</nav>
+</nav>
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,18 +1,18 @@
-<footer class="bg-gray-light border-top py-4 text-gray text-center mt-6 flex-none">
+<footer class="color-bg-subtle border-top py-4 color-fg-muted text-center mt-6 flex-none">
   <span aria-label="Made with love by GitHub and friends">
-    <a href="https://github.com/{{ site.gh_repo }}" class="text-gray-dark mb-2">
+    <a href="https://github.com/{{ site.gh_repo }}" class="color-fg-default mb-2">
       Made with :heart: by :octocat:s and friends
     </a>
   </span>
   <div class="d-flex flex-justify-center text-uppercase text-bold my-1">
-    <a href="{{ site.baseurl }}/feed.xml" aria-label="Feed xml" class="d-flex flex-items-center text-gray text-uppercase mr-4">
-      <div class="d-flex mr-1">{% octicon rss %}</div> 
+    <a href="{{ site.baseurl }}/feed.xml" aria-label="Feed xml" class="d-flex flex-items-center color-fg-muted text-uppercase mr-4">
+      <div class="d-flex mr-1">{% octicon rss %}</div>
       {{ site.data.ui-text[site.locale].feed_label }}
     </a>
-    <a href="https://github.community" class="d-flex flex-items-center text-gray text-uppercase"><div class="d-flex mr-1">{% octicon organization %}</div> Community</a>
+    <a href="https://github.community" class="d-flex flex-items-center color-fg-muted text-uppercase"><div class="d-flex mr-1">{% octicon organization %}</div> Community</a>
   </div>
-  
-  <p>&copy; {{ site.time | date: '%Y' }} {{ site.name }} {{ site.data.ui-text[site.locale].powered_by }}  <a href="https://jekyllrb.com" rel="nofollow" class="text-gray-dark">Jekyll</a> &amp; 
-    <a href="https://github.com/primer/primer-css" rel="nofollow" class="text-gray-dark">Primer</a>.
+
+  <p>&copy; {{ site.time | date: '%Y' }} {{ site.name }} {{ site.data.ui-text[site.locale].powered_by }}  <a href="https://jekyllrb.com" rel="nofollow" class="color-fg-default">Jekyll</a> &amp;
+    <a href="https://github.com/primer/primer-css" rel="nofollow" class="color-fg-default">Primer</a>.
   </p>
 </footer>
diff --git a/_includes/header.html b/_includes/header.html
@@ -5,9 +5,9 @@
 {% endif %}
 {% assign nav = site.data.navigation["main"][lang] %}
 
-<div class="bg-blue-darker py-3 f5 flex-none text-white">
+<div class="bg-blue-darker py-3 f5 flex-none color-fg-on-emphasis">
   <header class="container-lg p-responsive site-header js-site-header d-block clearfix">
-    <a class="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">
+    <a class="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">
       <div class="mr-3">{% octicon mark-github %}</div>
       {{ site.data.navigation["banner"][lang].title }}
     </a>
@@ -19,7 +19,7 @@
     <nav class="site-header-menu float-none float-md-right py-1 mt-4 mt-md-0">
       <ul class="d-block d-md-flex list-style-none">
         {% for link in nav %}
-          <li class="ml-0 ml-md-3"><a class="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>
+          <li class="ml-0 ml-md-3"><a class="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>
         {% endfor %}
       </ul>
     </nav>
diff --git a/_includes/light-hero.html b/_includes/light-hero.html
@@ -1,4 +1,4 @@
-<div class="border-bottom border-top py-6 bg-gray-light text-center">
+<div class="border-bottom border-top py-6 color-bg-subtle text-center">
   <div class="container-lg py-6 p-responsive">
     <h1>{{ page.title }}</h1>
     {% if page.description %}
diff --git a/assets/_scss/curriculum.scss b/assets/_scss/curriculum.scss
@@ -2,7 +2,7 @@
 @mixin octicon-link($char){
   font: normal normal 1em octicons;
   text-decoration: none;
-  color: $blue;
+  color: var(--color-text-link);
 
   &:after{
     content: $char;
@@ -48,7 +48,7 @@
 }
 
 .display-controls{
-  border-top: solid 2px $gray-200;
+  border-top: solid 2px var(--color-border-primary);
   margin-top: 5px;
   padding-top: 10px;
 }
@@ -67,13 +67,13 @@
   width: 0;
 
   &:checked + label{
-    color: $blue;
+    color: var(--color-text-blue);
 
     &:before{
       content: '\f046';
-      color: rgba($gray-100, 1);
-      background-color: $gray-300;
-      box-shadow: 0 0 0 1px $gray-300;
+      color: rgba(var(--color-scale-gray-1), 1);
+      background-color: var(--color-scale-gray-3);
+      box-shadow: 0 0 0 1px var(--color-scale-gray-3);
       padding-left: 0px;
       line-height: 14px;
     }
@@ -91,11 +91,11 @@
     left: 0;
     display: inline-block;
     border-radius: 50%;
-    color: rgba($gray-300, 0);
+    color: rgba(var(--color-scale-gray-3), 0);
     -webkit-transition: all 180ms;
     width: 14px;
     height: 14px;
-    box-shadow: 0 0 0 1px $gray-300;
+    box-shadow: 0 0 0 1px var(--color-scale-gray-3);
   }
 }
 
@@ -105,13 +105,13 @@
   width: 0;
 
   &:checked + label{
-    color: $gray-300;
+    color: var(--color-scale-gray-3);
 
     &:before{
       content: '\f03a';
-      color: rgba($gray-100, 1);
-      background-color: $gray-300;
-      box-shadow: 0 0 0 1px $gray-300;
+      color: rgba(var(--color-scale-gray-1), 1);
+      background-color: var(--color-scale-gray-3);
+      box-shadow: 0 0 0 1px var(--color-scale-gray-3);
       padding-left: 0px;
       line-height: 1em;
     }
@@ -129,12 +129,12 @@
     left: 0;
     display: inline-block;
     border-radius: 50%;
-    color: rgba($gray-300, 0);
+    color: rgba(var(--color-scale-gray-3), 0);
     -webkit-transition: all 180ms;
     padding-left: 5px;
     width: 14px;
     height: 14px;
-    box-shadow: 0 0 0 1px $gray-300;
+    box-shadow: 0 0 0 1px var(--color-scale-gray-3);
     line-height: .2em;
   }
 }
@@ -180,7 +180,7 @@
   position: relative;
   font: 13px/1.4 Helvetica, arial, freesans, clean, sans-serif;
   font-weight: 300;
-  color: $gray-900;
+  color: var(--color-scale-gray-9);
 
   h1,h2,h3,h4,h5,h6,p,ul,li{
     font-weight: inherit;
@@ -196,7 +196,7 @@
     }
     p,ul{
       font-size: 20px;
-      color: $gray;
+      color: var(--color-text-gray);
     }
 
     .objectives{
@@ -224,7 +224,7 @@
           width: 20px;
           margin: 10px;
           border-radius: 50%;
-          box-shadow: 0 0 0 2px $gray-100;
+          box-shadow: 0 0 0 2px var(--color-scale-gray-1);
         }
       }
 
@@ -233,22 +233,22 @@
 
         &:before{
           content: "\f03a";
-          color: $blue;
+          color: var(--color-text-blue);
         }
       }
     }
 
     // Custom Octicon styling
     .mega-octicon{
       font-size: 110px;
-      color: $blue;
+      color: var(--color-text-blue);
 
       &:after{
         content: "";
         display: block;
         width: 170px;
         height: 170px;
-        border: solid 1px $gray-300;
+        border: solid 1px var(--color-border-tertiary);
         border-radius: 50%;
         padding: 20px;
         margin-top: -142px;
@@ -258,7 +258,7 @@
 
   #teacher{
     .octicon{
-      color: $blue;
+      color: var(--color-text-blue);
     }
     span{
       margin: auto 4px;
@@ -302,8 +302,8 @@
       font-size: 120%;
       text-align: left;
       margin: 0 auto;
-      background: $gray-900;
-      color: $gray-100;
+      background: var(--color-bg-canvas-inverse);
+      color: var(--color-scale-gray-1);
 
       code{
         font-size: 1.5em;
diff --git a/assets/_scss/github_contribution_graph.scss b/assets/_scss/github_contribution_graph.scss
@@ -1,9 +1,9 @@
 .contribution_graph {
   font-size: $font-size-small;
-  color: $gray-700;
+  color: var(--color-scale-gray-7);
   padding: $spacer-2;
   border-radius: 4px;
-  border: 1px solid $gray-300;
+  border: 1px solid var(--color-border-tertiary);
 }
 
 .svg-tip {
diff --git a/assets/_scss/timeline.scss b/assets/_scss/timeline.scss
@@ -12,7 +12,7 @@
     left: 40px;
     width: 2px;
     margin-left: -1.5px;
-    background-color: $gray-200;
+    background-color: var(--color-scale-gray-2);
 }
 
 .timeline-image {
@@ -89,11 +89,11 @@
     width: 80px;
     height: 80px;
     margin-left: 0;
-    border: 4px solid $gray-200;
+    border: 4px solid var(--color-border-primary);
     border-radius: 100%;
     text-align: center;
-    color: $white;
-    background-color: $white;
+    color: var(--color-text-white);
+    background-color: var(--color-bg-primary);
 }
 
 .timeline>li p{
diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -2,9 +2,7 @@
 redirect_to: false
 ---
 
-@import "primer-core/index.scss";
-@import "primer-product/index.scss";
-@import "primer-marketing/index.scss";
+@import "@primer/css/index.scss";
 
 @import "timeline";
 @import "curriculum";
@@ -21,11 +19,11 @@ details.flash {
 }
 
 .bg-blue-dark {
-  background-color: $blue-600 !important;
+  background-color: var(--color-scale-blue-6) !important;
 }
 
 .bg-blue-darker {
-  background-color: $blue-700 !important;
+  background-color: var(--color-scale-blue-7) !important;
 }
 
 .octicon { fill: currentColor; }
@@ -36,7 +34,7 @@ details.flash {
 
   .site-header-menu {
     li {
-      border-bottom: 1px solid $gray-300;
+      border-bottom: 1px solid var(--color-border-tertiary);
 
       @include breakpoint(md) {
         border-bottom: none;
@@ -55,13 +53,23 @@ details.flash {
 
   h1, h2, h3, h4, h5, h6 {
     -webkit-font-smoothing: antialiased;
-    font-family: $alt-body-font;
+    font-family: $font-mktg;
   }
 
-  h1 { @include alt-h1; }
+  @mixin h1-mktg {
+    font-size: $h1-size-mobile !important;
+    @include breakpoint(md) { font-size: $h1-size !important; }
+  }
+
+  h1 { @include h1-mktg; }
+
+  @mixin h2-mktg {
+    font-size: $h2-size-mobile !important;
+    @include breakpoint(md) { font-size: $h2-size !important; }
+  }
 
   h2 {
-    @include alt-h2;
+    @include h2-mktg;
     margin-top: $spacer-6;
     margin-bottom: $spacer-3;
     line-height: 1.25;
@@ -73,8 +81,13 @@ details.flash {
     }
   }
 
+  @mixin h3-mktg {
+    font-size: $h3-size-mobile !important;
+    @include breakpoint(md) { font-size: $h3-size !important; }
+  }
+
   h3 {
-    @include alt-h3;
+    @include h3-mktg;
     margin-top: $spacer-4;
     margin-bottom: $spacer-3;
 
@@ -111,10 +124,10 @@ details.flash {
 
   @media (max-width: $width-md) {
     display: flex;
-    color: $gray-400;
+    color: var(--color-scale-gray-4);
 
     &:hover {
-      color: $gray-300;
+      color: var(--color-scale-gray-3);
     }
   }
 }
@@ -129,7 +142,7 @@ details.flash {
   transition: box-shadow 0.2s ease-in-out;
 
   &:hover {
-    box-shadow: $box-shadow-large;
+    box-shadow: var(--color-shadow-large);
     text-decoration: none;
   }
 }
diff --git a/index.html b/index.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="border-bottom border-top py-6 bg-gray-light text-center">`
	`1`	`+<div class="border-bottom border-top py-6 color-bg-subtle text-center">`
`2`	`2`	`<div class="container-lg py-6 p-responsive">`
`3`	`3`	`<h1>{{ page.title }}</h1>`
`4`	`4`	`{% if page.description %}`