From 07c39345a8231f3b6ecfb8b945c56dcf9fa407f2 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 26 Oct 2022 10:33:23 -0700 Subject: [PATCH 1/8] Replace deprecated `setup-ruby` action --- .github/workflows/jekyll.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index b8e40b2a6..8485dc812 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -17,14 +17,12 @@ jobs: # Ruby-specific steps - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@ece82769428359c077b5a5eaff268902a303c101 with: ruby-version: 2.6.x + 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 From 16569f20dc4fb62e7f0c721d8a07faee04da4912 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 26 Oct 2022 10:33:36 -0700 Subject: [PATCH 2/8] Upgrade Ruby from 2.6 to 3.0 --- .github/workflows/jekyll.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 8485dc812..e8681aff4 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -16,10 +16,10 @@ jobs: npm install # Ruby-specific steps - - name: Set up Ruby 2.6 + - name: Set up Ruby 3.0 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: bundle exec rake From f7c83b2443e420992c69ffa15a0db865be7bbf16 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 26 Oct 2022 10:34:27 -0700 Subject: [PATCH 3/8] Upgrade lockfile version --- package-lock.json | 289 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 288 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 89ea69fac..05396cf6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,295 @@ { "name": "training-kit", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "training-kit", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "primer-css": "^9.3.0" + }, + "devDependencies": {} + }, + "node_modules/primer-alerts": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/primer-alerts/-/primer-alerts-1.5.1.tgz", + "integrity": "sha512-2dyRO6ZgZF9ZR67gg+viCtsYV9CG+z6UARW8DAf4CEDkeiR4K46R6kKSC/WveEv8LPJ0MF+L4IXjqvn5kqK7zA==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-avatars": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-avatars/-/primer-avatars-1.4.1.tgz", + "integrity": "sha512-kd+GPMZqdXZ+N07CYeCWmRHCHUCeeCFNWldbgCg07NRfU+Ne9n01CLR/DcNuG27oP5A30ubvHnoEofvkgG3ynw==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-base": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/primer-base/-/primer-base-1.5.1.tgz", + "integrity": "sha512-7tv0/V5sSRucp65NQXEyC8E2GP9EumLSKFDrjbl0liZTwSve8HUm7TmzgDXkO5pWd0VSfc7+5G1qrrdsGNmkPQ==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-blankslate": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-blankslate/-/primer-blankslate-1.4.1.tgz", + "integrity": "sha512-osgVtGY6UikfK1vuoBWijxT1C+SsD8RQxvYS8RFMDh6bReEf45//3n0NJVksRT8GdGUS8atRnrsWzRCtDcEwAg==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-box": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/primer-box/-/primer-box-2.5.1.tgz", + "integrity": "sha512-jfJjDLQlaM9e5pyzcJHALEb3Gml5uEoDDAoWKiKwvxEhl6da+5DB+HGbEt3/KUqt9B3e9Omy6IBvvRfgnqae7A==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-breadcrumb": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-breadcrumb/-/primer-breadcrumb-1.4.1.tgz", + "integrity": "sha512-cmDjIXSXClLQcrWDeJkZJWXkacfCluZU23mfsVM8K0oZyhiHZjbleOdsbwGXMKpFSEJ61wi4zvF9ZMkx1s8EdA==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-buttons": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/primer-buttons/-/primer-buttons-2.4.1.tgz", + "integrity": "sha512-wOb0FMkRI/sWntorY9KXzY/OVxT5P/V+xlotbEC3+SPfzTLG+vJCs5rsamMu7S4TzhOx675/DTSpMo83iY4h3w==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-cards": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/primer-cards/-/primer-cards-0.5.1.tgz", + "integrity": "sha512-iXqvCgL311UBoRbC/ioFYSUunFnS8rUGkyALtN3/qAw3LoeyE1vjcooV0f1ja/xOblH0vGa32HjEKo2sBTwQ7g==", + "deprecated": "The primer-cards module has been deprecated. We recommend using primer-box instead.", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-core": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/primer-core/-/primer-core-6.4.1.tgz", + "integrity": "sha512-IxOLJ3BGLLFhDQ329zGgBMLaflqTn/WKAbRhl3XGIVh2vyRLBr8XPhzTfWfeFKt9WQ3ljzZkwip1GsMX9qqb1Q==", + "dependencies": { + "primer-base": "1.5.1", + "primer-box": "2.5.1", + "primer-buttons": "2.4.1", + "primer-forms": "1.4.1", + "primer-layout": "1.4.1", + "primer-navigation": "1.4.1", + "primer-support": "4.4.1", + "primer-table-object": "1.4.1", + "primer-tooltips": "1.4.1", + "primer-truncate": "1.4.1", + "primer-utilities": "4.8.1" + } + }, + "node_modules/primer-css": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/primer-css/-/primer-css-9.6.0.tgz", + "integrity": "sha512-qzTck5gvQevHvI3sUgP0D2QzLdmAqwd9h1rucMObOIbp8xQcM8zZGFNo71FBu7TxNu4A00McNvnadSNOgmnJnA==", + "deprecated": "As of version 10, the name has been changed to primer. Install with 'npm install primer'", + "dependencies": { + "primer-alerts": "1.5.1", + "primer-avatars": "1.4.1", + "primer-base": "1.5.1", + "primer-blankslate": "1.4.1", + "primer-box": "2.5.1", + "primer-breadcrumb": "1.4.1", + "primer-buttons": "2.4.1", + "primer-cards": "0.5.1", + "primer-core": "6.4.1", + "primer-forms": "1.4.1", + "primer-labels": "1.5.1", + "primer-layout": "1.4.1", + "primer-markdown": "3.7.1", + "primer-marketing": "5.4.1", + "primer-marketing-support": "1.3.1", + "primer-marketing-type": "1.4.1", + "primer-marketing-utilities": "1.4.1", + "primer-navigation": "1.4.1", + "primer-page-headers": "1.4.1", + "primer-page-sections": "1.4.1", + "primer-product": "5.4.1", + "primer-support": "4.4.1", + "primer-table-object": "1.4.1", + "primer-tables": "1.4.1", + "primer-tooltips": "1.4.1", + "primer-truncate": "1.4.1", + "primer-utilities": "4.8.1" + } + }, + "node_modules/primer-forms": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-forms/-/primer-forms-1.4.1.tgz", + "integrity": "sha512-wr7Ieoyy9iHPtR1zEaWEwPRA3PHo1eaOj3Q4VhYOBRv3rk+H3/Z49hey7PLyocPnvbF1GdG2s5/VkZUdgBEuqg==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-labels": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/primer-labels/-/primer-labels-1.5.1.tgz", + "integrity": "sha512-dsX98awj7UYKvhed+j47ChldBX9sV5OSO3MhhVAHon7Kj5kxPCLFkTw/YlOxOHFX2VlbP/5jMM5W46xnSERy1g==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-layout": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-layout/-/primer-layout-1.4.1.tgz", + "integrity": "sha512-x4u8twf8XGFL3mKplh0XM7jUjTL9Is/97BmlehZMQE+740G/gywPo2CpOV2GMCxWzmhQVJhib8At1+UvN+qvZQ==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-markdown": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/primer-markdown/-/primer-markdown-3.7.1.tgz", + "integrity": "sha512-62I7tZaCCnOgjc2yE1cuu4WTwbym/eNIpEMB0CSWvFf8ZiTVKC5dNpFIwT1ipE35IjgOVopdHdqdPzMXoxKNAg==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-marketing": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/primer-marketing/-/primer-marketing-5.4.1.tgz", + "integrity": "sha512-ccadKuKA4kQDTaopHsj+lOujdxa8d14Ff8fq5HLvHlrpgKvdVwuKtIwNL2ryuas1FVeTddxa3lBnlAcuVTwWIQ==", + "dependencies": { + "primer-breadcrumb": "1.4.1", + "primer-cards": "0.5.1", + "primer-marketing-support": "1.3.1", + "primer-marketing-type": "1.4.1", + "primer-marketing-utilities": "1.4.1", + "primer-page-headers": "1.4.1", + "primer-page-sections": "1.4.1", + "primer-support": "4.4.1", + "primer-tables": "1.4.1" + } + }, + "node_modules/primer-marketing-support": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/primer-marketing-support/-/primer-marketing-support-1.3.1.tgz", + "integrity": "sha512-GDwQ4TdZNS4p6UbSMxv7j7DlgegEDU43k2QKFJZ9EAtBN/rOKkf9gBa31yEiJQvgG7wZ84CvioObYtw885TL7g==" + }, + "node_modules/primer-marketing-type": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-marketing-type/-/primer-marketing-type-1.4.1.tgz", + "integrity": "sha512-cJGHvDkCy1bYiM2EDOwc+k7Y61DfvOIWambU5WmsGq7fUI92MRWqpyWZpYVOFEWqItRjLnxPv4myJCm0itKIRQ==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-marketing-utilities": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-marketing-utilities/-/primer-marketing-utilities-1.4.1.tgz", + "integrity": "sha512-dbic/+lYITBnZKujg6s3GF0Mo3jhuiq1ps0a3negkBsxKsNyU68hoYEl2bN6UI5L2BX9GyzCLd58N1jyjV4uCw==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-navigation": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-navigation/-/primer-navigation-1.4.1.tgz", + "integrity": "sha512-fMVrR8l/JtTXLzwf+8nHeBvoIQKysfbMLbU3VArSMaQp1/IwRS9eT4NijdpGoIeh2tmxD4nA+BM/dWHfjMucAw==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-page-headers": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-page-headers/-/primer-page-headers-1.4.1.tgz", + "integrity": "sha512-kmSi4Sys2dqt74sO1b5LcJq/EAnLe9p8t6oAs4PfkwgYXAdJPwHyTfe2+fueHYgqi07AlK3bnr1gw9rFen475Q==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-page-sections": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-page-sections/-/primer-page-sections-1.4.1.tgz", + "integrity": "sha512-WR5abovsjAKlbZjn4q7+eLCEA3gnwh/tuZDJnZ3l2V5O+IpHYVXI5Boi6QxbQM3mbHOL19NJhQEyfcHXBe7AQw==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-product": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/primer-product/-/primer-product-5.4.1.tgz", + "integrity": "sha512-W1sVne7TPc2FF+c8GHqWnWtQQOzkr7R6mT1wwafwsY8GiCCkUxOtn0JPORrHzx67FV1GSWVMJ49F7pQPcl1Zcw==", + "dependencies": { + "primer-alerts": "1.5.1", + "primer-avatars": "1.4.1", + "primer-blankslate": "1.4.1", + "primer-labels": "1.5.1", + "primer-markdown": "3.7.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-support": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/primer-support/-/primer-support-4.4.1.tgz", + "integrity": "sha512-stQEoF4NfWy8JOVASUHxGY+Ot1eBguPH8rWoeLQy16zKzcS16kRccfvGbBXyv0G/aA+DdL8ZmjlXB2ubJ+wBJg==" + }, + "node_modules/primer-table-object": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-table-object/-/primer-table-object-1.4.1.tgz", + "integrity": "sha512-OkE3knDjLlzSot0/Q9O/b5GuKWTaxFyB/2CcZttA3WizAkxlkV4ql/Xy8mFr6WxBQORkBrrbxWUZC+Ulj88ZIQ==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-tables": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-tables/-/primer-tables-1.4.1.tgz", + "integrity": "sha512-Dk9ttoxIDigcJQ0vhh3VDkOL+/spGdEJacRFvNsysS4IbDOUDilXLZFcUZB2wCbhXFHS/CObk+/3zoW39J/6tg==", + "dependencies": { + "primer-marketing-support": "1.3.1", + "primer-support": "4.4.1" + } + }, + "node_modules/primer-tooltips": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-tooltips/-/primer-tooltips-1.4.1.tgz", + "integrity": "sha512-Id0g033elSx7Sy7+HDzha4Tuv24QxPzVtT15IHSOXXa900NjZqR1HHQIyMd1EkVfPt2sZ3Z0/k0cTvdqXs6eJQ==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-truncate": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/primer-truncate/-/primer-truncate-1.4.1.tgz", + "integrity": "sha512-spBAPx7944txGXLCNGv+WZnPG4MiMhqn3srKlpGL2nmfcLxI+geviD+GhY/b42GyCgxRhcucrt/jxKYfsaBdww==", + "dependencies": { + "primer-support": "4.4.1" + } + }, + "node_modules/primer-utilities": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/primer-utilities/-/primer-utilities-4.8.1.tgz", + "integrity": "sha512-3wu8GUsJVVa0IIUdIKP+ZVSFPmX8v2NQWjBSJK00GbSPwthztOnFEoE40Ru7wAuUDNXWu9zMnx2i0lcyDu+yBg==", + "dependencies": { + "primer-support": "4.4.1" + } + } + }, "dependencies": { "primer-alerts": { "version": "1.5.1", From 374f1eb4e2909f3adc3cc164fcb777f4a6ea5194 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 26 Oct 2022 15:38:16 -0700 Subject: [PATCH 4/8] Update to latest version of Primer --- _includes/breadcrumbs.html | 4 +- _includes/footer.html | 16 +- _includes/header.html | 6 +- _includes/light-hero.html | 2 +- assets/_scss/curriculum.scss | 46 +- assets/_scss/github_contribution_graph.scss | 4 +- assets/_scss/timeline.scss | 8 +- assets/css/main.scss | 39 +- index.html | 6 +- package-lock.json | 566 +------------------- package.json | 9 +- 11 files changed, 98 insertions(+), 608 deletions(-) diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index b0dca38bb..79d242a64 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -38,7 +38,7 @@ {% endif %} {% if forloop.last %} -
  • +
  • {{ page.title }}
    • {% else %} @@ -52,4 +52,4 @@ {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/_includes/footer.html b/_includes/footer.html index f6765fb9a..c76945977 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,18 +1,18 @@ -