Merge branch 'master' into rewrite-getting-started

.github/workflows/danger-generate.yml

@@ -21,21 +21,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ScratchAddons/website-v2
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: repo
       - name: Checkout ScratchAddons/website-v2-script
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ScratchAddons/website-v2-script
           path: script
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('.github/workflows/danger-generate.yml') }}
@@ -51,7 +51,7 @@ jobs:
           PR_NUMBER: ${{ github.event.number }}
 
       - name: Upload for sending
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: to-send
           path: |

.github/workflows/danger-send.yml

@@ -13,21 +13,21 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout ScratchAddons/website-v2
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/.github/workflows/danger-send.yml') }}
           restore-keys: ${{ runner.os }}-node-
 
       - name: Download artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({

.github/workflows/deploy-test.yml

@@ -40,33 +40,33 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout ScratchAddons/website-v2 (deployment)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: github.event_name != 'pull_request'
         with:
           path: repo
           fetch-depth: 0
       - name: Checkout ScratchAddons/website-v2 (testing)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: github.event_name == 'pull_request'
         with:
           path: repo
       - name: Checkout ScratchAddons/website-v2-script
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ScratchAddons/website-v2-script
           path: script
       - name: Checkout ScratchAddons/website-i18n
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ScratchAddons/website-i18n
           path: i18n
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -79,22 +79,22 @@ jobs:
           bash ../script/sh/hugo-deploy-site.sh
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
+        uses: peaceiris/actions-hugo@v3
         with:
-          hugo-version: latest
+          hugo-version: '0.119.0'
           extended: true
       - name: Build site
         run: |
           cd repo
           hugo --gc --minify --config config.yml,config-prod.yml
 
       - name: Upload GitHub Pages artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         if: (github.event_name != 'pull_request') && (github.repository_owner == 'ScratchAddons') && (github.ref_name == 'master')
         with:
           path: ./repo/public
       - name: Upload whole repo
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: (github.event_name == 'workflow_dispatch') && (inputs.upload_repo)
         with:
           name: repo
@@ -116,4 +116,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/update-addons-data.yml

@@ -14,27 +14,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ScratchAddons/website-v2
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: repo
       - name: Checkout ScratchAddons/website-v2-script
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ScratchAddons/website-v2-script
           path: script
       - name: Checkout ScratchAddons/ScratchAddons
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ScratchAddons/ScratchAddons
           path: sa
           ref: ${{ github.event.inputs.ref }}
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -47,13 +47,13 @@ jobs:
           bash ../script/sh/hugo-update-addons-data.sh
 
       - name: Generate token 
-        uses: tibdex/github-app-token@v1
+        uses: tibdex/github-app-token@v2
         id: generate-token
         with:
           app_id: ${{ secrets.BOT_APP_ID }}
           private_key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: Update addons data (${{ github.event.inputs.ref }})

.gitignore

@@ -5,4 +5,11 @@ assets/jsconfig.json
 hugo_stats.json
 
 # Temporary lock file while building
-.hugo_build.lock
+.hugo_build.lock
+
+# Built files
+content-i18n/
+credits/contributortypes/description/*.yml
+!credits/contributortypes/description/en.yml
+data/changelogi18n/
+data/giscuslangs.json

assets/assets/css/base.scss

@@ -153,7 +153,9 @@ body > footer {
 		img {
 			height: 37.5px; 
 			width: 37.5px; 
-			transform: scale(1.25)
+			transform: scale(1.25);
+			background-color: $scratch-orange;
+			border-radius: 100%;
 		}
 
 		.navbar-brand {
@@ -273,6 +275,11 @@ body {
 
 	--navbar-height: 59.5px;
 
+	@media (prefers-contrast: more) {
+		--header-bg: #{darken($scratch-orange, 30%)};
+		--intro-heading-bg: #{darken($scratch-orange, 30%)};
+	}
+
 }
 
 body.dark {
@@ -323,6 +330,10 @@ body.dark.extension-styled {
 	--secondary-bg-2: #{$dark-ext-level-2};
 	--secondary-border: #{$dark-ext-level-3};
 
+	@media (prefers-contrast: more) {
+		--header-bg: #{$dark-ext-level-2};
+	}
+
 }
 
 // =============================================================
@@ -331,12 +342,6 @@ body.dark.extension-styled {
 
 body.dark {
 
-	header {
-		img {
-			transform: scale(1.25);
-		}
-	}
-
 	textarea, input {
 		background-color: $dark-dp-1;
 		border-color: $dark-dp-16;
@@ -387,7 +392,7 @@ body.dark {
 // =============================================================
 
 body.extension-styled {
-	@import url('https://fonts.googleapis.com/css2?family=Sora:wght@300;400;500;600;700&display=swap');
+	@import url('https://cdn.jsdelivr.net/npm/@fontsource/sora/index.min.css');
 
 	font-family: "Sora", $bs-font-family-sans-serif;
 	font-size-adjust: 0.47;