From 0d4e09795548e6ab8e18ec1bc9e16213d3aaece3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 May 2022 17:36:44 +0000 Subject: [PATCH 01/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220504163817 --- package-lock.json | 80 +++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 26 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index d273cefbd..17b954c71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504060134", + "scratch-gui": "0.1.0-prerelease.20220504163817", "scratch-l10n": "3.14.20220504031551", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22850,37 +22850,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20220501111245", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220501111245.tgz", - "integrity": "sha512-OVebiUFtr/15yjEq4gd+6GI4JPAs5UG2SGe+/Zx+z3gVuIRjgkusCmAc5QexNOGypf91nnQQCVCocvk7QdhB8Q==", + "version": "0.1.0-prerelease.20220504122548", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220504122548.tgz", + "integrity": "sha512-Gt+PaW/p+K7iZucDG8Fwpx82GysReAwQnuogmmKccEpLoJRWpaOow8UN/oiUsUs63DXp5JexDNM6nueN+qO36g==", "dev": true, "dependencies": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220428031608" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.14.20220428031608", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220428031608.tgz", - "integrity": "sha512-FloINfIeRWPVnhdLV+gwStq6Zo2JkK0StjVraA1ueLj0Qf42owSWpn0ByYUHPfRx50KoB9hvMr6f0JYZuMzjMg==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.14.20220504031551" } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220504060134", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504060134.tgz", - "integrity": "sha512-MVFfuAxDAZG7s+apaGyGLom2WiH2R7gBBesYJl3tkMFDa28BBquasHuEBMaNYGj4Bt+rWqIIiBVyysY7RpiYLw==", + "version": "0.1.0-prerelease.20220504163817", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504163817.tgz", + "integrity": "sha512-aaBxfuKdSzo50jzz4pXADUVC+PwUUg8J+4nkm3/QrwuhITj2SwgA4R1OiTak8KstNeDCurarO/tQjVe9ysekxw==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22931,9 +22915,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220501111245", + "scratch-blocks": "0.1.0-prerelease.20220504122548", "scratch-l10n": "3.14.20220504031551", - "scratch-paint": "0.2.0-prerelease.20220429193038", + "scratch-paint": "0.2.0-prerelease.20220504103257", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", @@ -23228,9 +23212,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "0.2.0-prerelease.20220429193038", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220429193038.tgz", - "integrity": "sha512-1jCa4ieYjMOc/nKrOlcGCG0DtseR+YAapIYHlraUO6DGHTBm2frB//CDkEHwOIlN54ZPOak2WS4oJYKDuFgqEQ==", + "version": "0.2.0-prerelease.20220504103257", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", + "integrity": "sha512-FF1DW8DnMbJphTEQNEFUXPjF+Tz62UecyBsSPkfvCGSxTRxsaDQuIh7TSTFs02nsVIrJPYXNkJu06CQJxZtQrg==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -50743,35 +50727,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220501111245", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220501111245.tgz", - "integrity": "sha512-OVebiUFtr/15yjEq4gd+6GI4JPAs5UG2SGe+/Zx+z3gVuIRjgkusCmAc5QexNOGypf91nnQQCVCocvk7QdhB8Q==", + "version": "0.1.0-prerelease.20220504122548", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220504122548.tgz", + "integrity": "sha512-Gt+PaW/p+K7iZucDG8Fwpx82GysReAwQnuogmmKccEpLoJRWpaOow8UN/oiUsUs63DXp5JexDNM6nueN+qO36g==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220428031608" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20220428031608", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220428031608.tgz", - "integrity": "sha512-FloINfIeRWPVnhdLV+gwStq6Zo2JkK0StjVraA1ueLj0Qf42owSWpn0ByYUHPfRx50KoB9hvMr6f0JYZuMzjMg==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.14.20220504031551" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220504060134", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504060134.tgz", - "integrity": "sha512-MVFfuAxDAZG7s+apaGyGLom2WiH2R7gBBesYJl3tkMFDa28BBquasHuEBMaNYGj4Bt+rWqIIiBVyysY7RpiYLw==", + "version": "0.1.0-prerelease.20220504163817", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504163817.tgz", + "integrity": "sha512-aaBxfuKdSzo50jzz4pXADUVC+PwUUg8J+4nkm3/QrwuhITj2SwgA4R1OiTak8KstNeDCurarO/tQjVe9ysekxw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50822,9 +50792,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220501111245", + "scratch-blocks": "0.1.0-prerelease.20220504122548", "scratch-l10n": "3.14.20220504031551", - "scratch-paint": "0.2.0-prerelease.20220429193038", + "scratch-paint": "0.2.0-prerelease.20220504103257", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", @@ -51065,9 +51035,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20220429193038", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220429193038.tgz", - "integrity": "sha512-1jCa4ieYjMOc/nKrOlcGCG0DtseR+YAapIYHlraUO6DGHTBm2frB//CDkEHwOIlN54ZPOak2WS4oJYKDuFgqEQ==", + "version": "0.2.0-prerelease.20220504103257", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", + "integrity": "sha512-FF1DW8DnMbJphTEQNEFUXPjF+Tz62UecyBsSPkfvCGSxTRxsaDQuIh7TSTFs02nsVIrJPYXNkJu06CQJxZtQrg==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index b68c9077b..e674669dd 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504060134", + "scratch-gui": "0.1.0-prerelease.20220504163817", "scratch-l10n": "3.14.20220504031551", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 4858485c161a75c663f5770777f30d344884c0c7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 May 2022 00:38:45 +0000 Subject: [PATCH 02/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220504230037 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17b954c71..2765600b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504163817", + "scratch-gui": "0.1.0-prerelease.20220504230037", "scratch-l10n": "3.14.20220504031551", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22862,9 +22862,9 @@ } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220504163817", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504163817.tgz", - "integrity": "sha512-aaBxfuKdSzo50jzz4pXADUVC+PwUUg8J+4nkm3/QrwuhITj2SwgA4R1OiTak8KstNeDCurarO/tQjVe9ysekxw==", + "version": "0.1.0-prerelease.20220504230037", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504230037.tgz", + "integrity": "sha512-32RiPuFhX7hI5W+G2zz/3xsaqWNOIuUjzC8fKA5ewBdSVG3SCkiba1X9o+OgYb32UGw1VKmgThYAtNtNg7hGwQ==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22922,7 +22922,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220501145413", + "scratch-vm": "0.2.0-prerelease.20220504172200", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23512,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220501145413", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220501145413.tgz", - "integrity": "sha512-M6uETr2H3mnroeTAdO23TsQSg25yLXjmCzARj6Nrj4uZLHgxEmOx94kJItjdfYZ/N/+koGELSj9xzvL2gxalxA==", + "version": "0.2.0-prerelease.20220504172200", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220504172200.tgz", + "integrity": "sha512-xSoSgKRX3CLFz0uANmvHlGgw9ew4cj4WVanPTXlvfpCZ2pPdHwNwd4Z94nMWPgVFhICkZTBEeWixhJa9LCCfow==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50739,9 +50739,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220504163817", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504163817.tgz", - "integrity": "sha512-aaBxfuKdSzo50jzz4pXADUVC+PwUUg8J+4nkm3/QrwuhITj2SwgA4R1OiTak8KstNeDCurarO/tQjVe9ysekxw==", + "version": "0.1.0-prerelease.20220504230037", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504230037.tgz", + "integrity": "sha512-32RiPuFhX7hI5W+G2zz/3xsaqWNOIuUjzC8fKA5ewBdSVG3SCkiba1X9o+OgYb32UGw1VKmgThYAtNtNg7hGwQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50799,7 +50799,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220501145413", + "scratch-vm": "0.2.0-prerelease.20220504172200", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51310,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220501145413", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220501145413.tgz", - "integrity": "sha512-M6uETr2H3mnroeTAdO23TsQSg25yLXjmCzARj6Nrj4uZLHgxEmOx94kJItjdfYZ/N/+koGELSj9xzvL2gxalxA==", + "version": "0.2.0-prerelease.20220504172200", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220504172200.tgz", + "integrity": "sha512-xSoSgKRX3CLFz0uANmvHlGgw9ew4cj4WVanPTXlvfpCZ2pPdHwNwd4Z94nMWPgVFhICkZTBEeWixhJa9LCCfow==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index e674669dd..43d231825 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504163817", + "scratch-gui": "0.1.0-prerelease.20220504230037", "scratch-l10n": "3.14.20220504031551", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 61f58a4554c55f0167a0479d1e3e00202e58ce52 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 May 2022 05:01:47 +0000 Subject: [PATCH 03/44] chore(deps): update dependency scratch-l10n to v3.14.20220505031611 --- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2765600b1..0bd55f6cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220504230037", - "scratch-l10n": "3.14.20220504031551", + "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -22861,6 +22861,22 @@ "scratch-l10n": "3.14.20220504031551" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.14.20220504031551", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", + "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "0.1.0-prerelease.20220504230037", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504230037.tgz", @@ -23211,6 +23227,22 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.14.20220504031551", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", + "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220504103257", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", @@ -23314,9 +23346,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -50736,6 +50768,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20220504031551" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20220504031551", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", + "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51034,6 +51080,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220504031551", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", + "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "0.2.0-prerelease.20220504103257", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", @@ -51118,9 +51176,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 43d231825..5b22379cb 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220504230037", - "scratch-l10n": "3.14.20220504031551", + "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 7b8d4a6cf1323fe81645c35e116ba80cadb0fb63 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 May 2022 12:43:41 +0000 Subject: [PATCH 04/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220505121826 --- package-lock.json | 46 +++++++++------------------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bd55f6cf..071cfdc52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504230037", + "scratch-gui": "0.1.0-prerelease.20220505121826", "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22878,9 +22878,9 @@ } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220504230037", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504230037.tgz", - "integrity": "sha512-32RiPuFhX7hI5W+G2zz/3xsaqWNOIuUjzC8fKA5ewBdSVG3SCkiba1X9o+OgYb32UGw1VKmgThYAtNtNg7hGwQ==", + "version": "0.1.0-prerelease.20220505121826", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505121826.tgz", + "integrity": "sha512-bD2f8sswYE9/rnQygJkjp/x4AevqGiiO4FXWKCPTQb0jdMMs4D1doIeyHK0aampaYilIdN9gguCBtAI6Czwq1g==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22932,7 +22932,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20220504122548", - "scratch-l10n": "3.14.20220504031551", + "scratch-l10n": "3.14.20220505031611", "scratch-paint": "0.2.0-prerelease.20220504103257", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -23227,22 +23227,6 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220504103257", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", @@ -50785,9 +50769,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220504230037", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220504230037.tgz", - "integrity": "sha512-32RiPuFhX7hI5W+G2zz/3xsaqWNOIuUjzC8fKA5ewBdSVG3SCkiba1X9o+OgYb32UGw1VKmgThYAtNtNg7hGwQ==", + "version": "0.1.0-prerelease.20220505121826", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505121826.tgz", + "integrity": "sha512-bD2f8sswYE9/rnQygJkjp/x4AevqGiiO4FXWKCPTQb0jdMMs4D1doIeyHK0aampaYilIdN9gguCBtAI6Czwq1g==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50839,7 +50823,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20220504122548", - "scratch-l10n": "3.14.20220504031551", + "scratch-l10n": "3.14.20220505031611", "scratch-paint": "0.2.0-prerelease.20220504103257", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -51080,18 +51064,6 @@ "symbol-observable": "^1.0.3" } }, - "scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-paint": { "version": "0.2.0-prerelease.20220504103257", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", diff --git a/package.json b/package.json index 5b22379cb..979d3600e 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220504230037", + "scratch-gui": "0.1.0-prerelease.20220505121826", "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 9c3fef378531e3b505f7fb35e7a36e6c3102b38a Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 10:34:36 -0400 Subject: [PATCH 05/44] Add overflow-wrap for long German words --- src/views/annual-report/2021/annual-report.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 33d2f5f8e..e28ab52a0 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -191,6 +191,7 @@ a, a:link, a:visited, a:active{ @media #{$big} { h2 { max-width: 300px; + overflow-wrap: break-word; } } @@ -492,6 +493,7 @@ a, a:link, a:visited, a:active{ height: 134px; line-height: 1.5; text-align: center; + overflow-wrap: break-word; } p { From 14ea5f40a3d91efcf7f6556df9ca4cd3d8027afe Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 10:48:57 -0400 Subject: [PATCH 06/44] Fix alignment and naming of timeline illustrations --- .../annual-report/2021/annual-report.jsx | 18 +++++++------- .../annual-report/2021/annual-report.scss | 24 +++++++++---------- src/views/annual-report/2021/l10n.json | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 82ebf1c33..08c273b2a 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1676,20 +1676,20 @@ class AnnualReport extends React.Component { src="/images/annual-report/2021/3_Community Section/Timeline/April Illustration.svg" alt={this.props.intl.formatMessage({id: 'annualReport.2021.altApril'})} /> - {this.props.intl.formatMessage({id: -

- -

{this.props.intl.formatMessage({id:

+ +

+ {this.props.intl.formatMessage({id: +

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index e28ab52a0..2820d1904 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1684,17 +1684,17 @@ img.comment-viz{ @media #{$timeline-breakpoint} { display: none; } - .may{ - display: block; - position: absolute; - left: 121px; - top: 1300px; - } .june{ + display: block; + position: absolute; + left: 121px; + top: 1400px; + } + .august{ display: block; position: absolute; right: 58px; - top: 2127px; + top: 2427px; } img{ display: block; @@ -1703,13 +1703,13 @@ img.comment-viz{ position: absolute; right: 0px; } - &.may{ - left: 0px; - top: 900px; - } &.june{ + left: 0px; + top: 1000px; + } + &.august{ right: -50px; - top: 1570px; + top: 1870px; } } } diff --git a/src/views/annual-report/2021/l10n.json b/src/views/annual-report/2021/l10n.json index c2f0fac65..42b96a3a4 100644 --- a/src/views/annual-report/2021/l10n.json +++ b/src/views/annual-report/2021/l10n.json @@ -310,8 +310,8 @@ "annualReport.2021.altConnectingLine": "A dotted line connecting timeline elements.", "annualReport.2021.altApril": "A pen and Scratch components placed on top of a purple background.", - "annualReport.2021.altMay": "A birthday cake in front of a banner of flags displaying various types of LGBTQ+ pride.", - "annualReport.2021.altJune": "A potato, birthday had, and sunglasses on top of a purple background.", + "annualReport.2021.altJune": "A birthday cake in front of a banner of flags displaying various types of LGBTQ+ pride.", + "annualReport.2021.altAugust": "A potato, birthday had, and sunglasses on top of a purple background.", "annualReport.2021.altCard1": "A colorful blob floats in front of a black and gray background next to the words 'A dream In a world of nightmares.'", "annualReport.2021.altCard2": "A black woman is wearing a yellow headband and gold hoop earrings.", "annualReport.2021.altCard3": "The scratch cat mascot swings in front of buildings accompanied by text reading 'I think Scratch Cat is a superhero.'", From 3031b8247fb2aa5fceacd211871a8b4a1268b29e Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 10:56:14 -0400 Subject: [PATCH 07/44] Add links for april fools and scratch week --- src/views/annual-report/2021/annual-report.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 08c273b2a..4d12394d5 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1531,6 +1531,7 @@ class AnnualReport extends React.Component { date={this.props.intl.formatMessage( {id: 'annualReport.2021.yearInReviewCard3Date'} )} + link="https://scratch.mit.edu/studios/29293970/" title={this.props.intl.formatMessage( {id: 'annualReport.2021.yearInReviewCard3Title'} )} @@ -1556,6 +1557,7 @@ class AnnualReport extends React.Component { date={this.props.intl.formatMessage( {id: 'annualReport.2021.yearInReviewCard4Date'} )} + link="https://scratch.mit.edu/studios/29722528" title={this.props.intl.formatMessage( {id: 'annualReport.2021.yearInReviewCard4Title'} )} From 259df957541c3e4fbebc279fa57a710402e954df Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 10:58:03 -0400 Subject: [PATCH 08/44] =?UTF-8?q?Update=20Elaine=E2=80=99s=20username=20in?= =?UTF-8?q?=20AR=20and=20Credits=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/annual-report/2021/people.json | 2 +- src/views/credits/people.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/annual-report/2021/people.json b/src/views/annual-report/2021/people.json index 2710a8aba..742cdbdd1 100644 --- a/src/views/annual-report/2021/people.json +++ b/src/views/annual-report/2021/people.json @@ -130,7 +130,7 @@ "name": "Deborah" }, { - "userName": "epa85", + "userName": "NoodleKen11", "userId": 83956975, "name": "Elaine" }, diff --git a/src/views/credits/people.json b/src/views/credits/people.json index 828233893..629f32b90 100644 --- a/src/views/credits/people.json +++ b/src/views/credits/people.json @@ -120,7 +120,7 @@ "name": "Deep" }, { - "userName": "epa85", + "userName": "NoodleKen11", "userId": 83956975, "name": "Elaine" }, From 2cc54f2b35bd22f5ba31b124183216ec1217dc61 Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 11:24:46 -0400 Subject: [PATCH 09/44] Copy fix in Scratch Week card --- src/views/annual-report/2021/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/annual-report/2021/l10n.json b/src/views/annual-report/2021/l10n.json index 42b96a3a4..437363e73 100644 --- a/src/views/annual-report/2021/l10n.json +++ b/src/views/annual-report/2021/l10n.json @@ -157,7 +157,7 @@ "annualReport.2021.yearInReviewCard4Date": "May", "annualReport.2021.yearInReviewCard4Title": "Scratch Week", - "annualReport.2021.yearInReviewCard4Text": "Scratchers around the world shared more than 3,500 projects responding to themed prompts like “Cooking From Scratch” and “Ridiculous Inventions” to celebrate Scratch's birthday.", + "annualReport.2021.yearInReviewCard4Text": "Scratchers around the world shared more than 3,500 projects responding to themed prompts like “Cooking With Scratch” and “Ridiculous Inventions” to celebrate Scratch's birthday.", "annualReport.2021.yearInReviewCard5Date": "June", "annualReport.2021.yearInReviewCard5Title": "Pride Month", From 9eef5668fd9150f862906b8e8159247d4c4752ff Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 11:39:50 -0400 Subject: [PATCH 10/44] Change Scratch Lab spinner and button color --- src/views/annual-report/2021/annual-report.jsx | 3 +++ src/views/annual-report/2021/annual-report.scss | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 4d12394d5..5a6a387a3 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1747,6 +1747,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/3_Community Section/Scratch Lab video.png" videoId="go1wqxifjk" thumbnailWidth="580" @@ -1767,6 +1768,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/3_Community Section/Scratch Lab video.png" videoId="go1wqxifjk" thumbnailWidth="400" @@ -1784,6 +1786,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/3_Community Section/Scratch Lab video.png" videoId="go1wqxifjk" thumbnailWidth="300" diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 2820d1904..9aa96f675 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -2366,6 +2366,11 @@ p.contain-p{ background-size: contain; background-repeat: no-repeat; background-position: center; + + .button { + background-color: $ui-purple-dark; + } + @media #{$intermediate-and-smaller} { background-image: none; } From 220511ee076a815fcf31545e9f13e6e857c8954f Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 12:01:03 -0400 Subject: [PATCH 11/44] Reach section vertical spacing --- src/views/annual-report/2021/annual-report.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 9aa96f675..eb87a53d9 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -819,6 +819,7 @@ a, a:link, a:visited, a:active{ flex-direction: row; justify-content: space-around; align-items: center; + img, p { margin: 0 40px; } @@ -838,6 +839,7 @@ a, a:link, a:visited, a:active{ } .datapoint.world{ + margin-top: 68px; @media #{$medium}{ img, p { margin: 0 0; @@ -853,6 +855,7 @@ a, a:link, a:visited, a:active{ } .datapoint.saudi-arabia{ + margin-top: 112px; h4{ text-align: left; margin-left: 40px; From 36158b3952f116b51cea006ef8612dc1e1f7bbb5 Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 14:12:12 -0400 Subject: [PATCH 12/44] Gray spinner for asl video --- src/views/annual-report/2021/annual-report.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 5a6a387a3..9d9d86f1c 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1005,6 +1005,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/2_Access Section/Deaf Kids Code Video.png" videoId="i2g46ikddf" thumbnailWidth="580" @@ -1025,6 +1026,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/2_Access Section/Deaf Kids Code Video.png" videoId="i2g46ikddf" thumbnailWidth="400" @@ -1042,6 +1044,7 @@ class AnnualReport extends React.Component { buttonMessage={ this.props.intl.formatMessage({id: 'annualReport.2021.watchVideo'}) } + spinnerColor="transparent-gray" thumbnail="/images/annual-report/2021/2_Access Section/Deaf Kids Code Video.png" videoId="i2g46ikddf" thumbnailWidth="300" From b58fd120a3bcb3ac137ebfffdf9693c5d67e0b8d Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 14:24:36 -0400 Subject: [PATCH 13/44] SEC spotlight spacing & g-jedi illustration --- .../annual-report/2021/annual-report.jsx | 2 +- .../annual-report/2021/annual-report.scss | 1 + .../G-JEDI Committee Illustration.svg | 26 ++++++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 9d9d86f1c..256f2f084 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -881,7 +881,7 @@ class AnnualReport extends React.Component { text={this.props.intl.formatMessage( {id: 'annualReport.2021.spotlightStory'} )} - color="green" + color="blue" type="spotlight" />

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index eb87a53d9..e33a1ce8a 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1213,6 +1213,7 @@ img.comment-viz{ .larger{ font-size: 1.25rem; line-height: 2.5rem; + margin-top: 8px; } @media #{$intermediate} { diff --git a/static/images/annual-report/2021/2_Access Section/G-JEDI Committee Illustration.svg b/static/images/annual-report/2021/2_Access Section/G-JEDI Committee Illustration.svg index 27beffab4..310e87a1b 100644 --- a/static/images/annual-report/2021/2_Access Section/G-JEDI Committee Illustration.svg +++ b/static/images/annual-report/2021/2_Access Section/G-JEDI Committee Illustration.svg @@ -4,6 +4,9 @@ + + + @@ -11,19 +14,24 @@ - - - - - - - + + + + + + + + + + + + - + - + From 61a6c8f50cd3b2520b88d690047031c632dff7e7 Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 14:33:03 -0400 Subject: [PATCH 14/44] Fix 10 New Languages spacing --- src/views/annual-report/2021/annual-report.jsx | 3 +-- src/views/annual-report/2021/annual-report.scss | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 256f2f084..250cb59ee 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1267,9 +1267,8 @@ class AnnualReport extends React.Component { type="snapshot left-align languages" />
-
+
-

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index e33a1ce8a..90d51f2ac 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1641,6 +1641,10 @@ img.comment-viz{ } } + .new-languages { + margin-top: 24px; + } + .year-in-review{ position: relative; padding: 330px 0 180px 0; From 9a291df074de49b052d0d4b9c3f5db2b73696dcb Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 15:18:29 -0400 Subject: [PATCH 15/44] Reach header spacing --- src/views/annual-report/2021/annual-report.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 90d51f2ac..45896be0e 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -627,7 +627,8 @@ a, a:link, a:visited, a:active{ } h2{ - font-size: 24px; + font-size: 2rem; + line-height: 1rem; } .reach-intro { From 12b79b3b1686df6160b2ea4f22937df0c1da9ca2 Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 15:36:03 -0400 Subject: [PATCH 16/44] Scratch Lab image alignment --- src/views/annual-report/2021/annual-report.jsx | 16 ++++++++-------- src/views/annual-report/2021/annual-report.scss | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index 250cb59ee..f781614b7 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1702,15 +1702,15 @@ class AnnualReport extends React.Component {
-
+ +
-

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 45896be0e..0761c3bda 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1449,6 +1449,11 @@ img.comment-viz{ .two-wide{ margin: 50px auto 0px; max-width: 840px; + + &.scratch-lab { + margin: 24px auto 0px; + } + .bubble{ margin: -25px 0 40px; } From 411566b1ce23e13d278f1e46fb31d18a3ac93ff5 Mon Sep 17 00:00:00 2001 From: seotts Date: Thu, 5 May 2022 16:09:46 -0400 Subject: [PATCH 17/44] Scratch Lab intro spacing --- src/views/annual-report/2021/annual-report.jsx | 6 +++--- src/views/annual-report/2021/annual-report.scss | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index f781614b7..d5e1fdb97 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1709,7 +1709,7 @@ class AnnualReport extends React.Component { color="purple" type="snapshot" /> -
+

@@ -1717,7 +1717,7 @@ class AnnualReport extends React.Component { -

+

@@ -1733,7 +1733,7 @@ class AnnualReport extends React.Component { -

+

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 0761c3bda..d0307e559 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -67,6 +67,10 @@ p { line-height: 2rem; } +.p-big { + font-size: 1.125rem; +} + p a { white-space: break-spaces; } @@ -1450,8 +1454,14 @@ img.comment-viz{ margin: 50px auto 0px; max-width: 840px; - &.scratch-lab { - margin: 24px auto 0px; + &.scratch-lab-intro { + margin: 24px auto 16px; + + @media #{$big}{ + .text { + max-width: 380px; + } + } } .bubble{ From f1b5f03f732d2249af6699c407a3666fbdaac8d7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 May 2022 22:18:01 +0000 Subject: [PATCH 18/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220505205652 --- package-lock.json | 96 ++++++++++++++++------------------------------- package.json | 2 +- 2 files changed, 34 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index 071cfdc52..6612cafb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220505121826", + "scratch-gui": "0.1.0-prerelease.20220505205652", "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22850,37 +22850,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20220504122548", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220504122548.tgz", - "integrity": "sha512-Gt+PaW/p+K7iZucDG8Fwpx82GysReAwQnuogmmKccEpLoJRWpaOow8UN/oiUsUs63DXp5JexDNM6nueN+qO36g==", + "version": "0.1.0-prerelease.20220505120102", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220505120102.tgz", + "integrity": "sha512-mYzYYCQpS/FGYc5ISLOLI4E5pJVYa5OKeboBIeNkGdZ0DbyS8A8e99ASnF6S5S162QYAaFx+El+ItHPEzfzz9g==", "dev": true, "dependencies": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220504031551" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.14.20220505031611" } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220505121826", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505121826.tgz", - "integrity": "sha512-bD2f8sswYE9/rnQygJkjp/x4AevqGiiO4FXWKCPTQb0jdMMs4D1doIeyHK0aampaYilIdN9gguCBtAI6Czwq1g==", + "version": "0.1.0-prerelease.20220505205652", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505205652.tgz", + "integrity": "sha512-TkVJcQsEKdl2Tgwbv1GEab070L+W8bzT9f3GXgNkeBtPaAVDT9SezOQyFMbVtVuGP/XCedSQfhQlOkiYWUt06w==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22931,14 +22915,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220504122548", + "scratch-blocks": "0.1.0-prerelease.20220505120102", "scratch-l10n": "3.14.20220505031611", - "scratch-paint": "0.2.0-prerelease.20220504103257", + "scratch-paint": "0.2.0-prerelease.20220505110517", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220504172200", + "scratch-vm": "0.2.0-prerelease.20220505153212", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23228,9 +23212,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "0.2.0-prerelease.20220504103257", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", - "integrity": "sha512-FF1DW8DnMbJphTEQNEFUXPjF+Tz62UecyBsSPkfvCGSxTRxsaDQuIh7TSTFs02nsVIrJPYXNkJu06CQJxZtQrg==", + "version": "0.2.0-prerelease.20220505110517", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", + "integrity": "sha512-c9APpwYegenR0D7XgqGhSe0okn1n26tgTagCkQ3KVl6wrYYKjhkw3xoMPgod4eXzjhkTmdNR7GsKRvJyvrLhig==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -23528,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220504172200", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220504172200.tgz", - "integrity": "sha512-xSoSgKRX3CLFz0uANmvHlGgw9ew4cj4WVanPTXlvfpCZ2pPdHwNwd4Z94nMWPgVFhICkZTBEeWixhJa9LCCfow==", + "version": "0.2.0-prerelease.20220505153212", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220505153212.tgz", + "integrity": "sha512-P2IPZztzCaiGblQtPEzh/iIipYLV2pc78/JIz/feqjdQT4WrRnJ6b0TJDJAICvY6F9f7DJbHQtP9vGvOA+gmPQ==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50743,35 +50727,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220504122548", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220504122548.tgz", - "integrity": "sha512-Gt+PaW/p+K7iZucDG8Fwpx82GysReAwQnuogmmKccEpLoJRWpaOow8UN/oiUsUs63DXp5JexDNM6nueN+qO36g==", + "version": "0.1.0-prerelease.20220505120102", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220505120102.tgz", + "integrity": "sha512-mYzYYCQpS/FGYc5ISLOLI4E5pJVYa5OKeboBIeNkGdZ0DbyS8A8e99ASnF6S5S162QYAaFx+El+ItHPEzfzz9g==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220504031551" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20220504031551", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220504031551.tgz", - "integrity": "sha512-X65xULMmmUrSrKf+dEplskLg+HcFQWc6hzAJN7x8/j5O252v5z7SKrJbLhH1lzmtHyGfeLgiy6aHOfzt1TmCnA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.14.20220505031611" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220505121826", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505121826.tgz", - "integrity": "sha512-bD2f8sswYE9/rnQygJkjp/x4AevqGiiO4FXWKCPTQb0jdMMs4D1doIeyHK0aampaYilIdN9gguCBtAI6Czwq1g==", + "version": "0.1.0-prerelease.20220505205652", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505205652.tgz", + "integrity": "sha512-TkVJcQsEKdl2Tgwbv1GEab070L+W8bzT9f3GXgNkeBtPaAVDT9SezOQyFMbVtVuGP/XCedSQfhQlOkiYWUt06w==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50822,14 +50792,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220504122548", + "scratch-blocks": "0.1.0-prerelease.20220505120102", "scratch-l10n": "3.14.20220505031611", - "scratch-paint": "0.2.0-prerelease.20220504103257", + "scratch-paint": "0.2.0-prerelease.20220505110517", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220504172200", + "scratch-vm": "0.2.0-prerelease.20220505153212", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51065,9 +51035,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20220504103257", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220504103257.tgz", - "integrity": "sha512-FF1DW8DnMbJphTEQNEFUXPjF+Tz62UecyBsSPkfvCGSxTRxsaDQuIh7TSTFs02nsVIrJPYXNkJu06CQJxZtQrg==", + "version": "0.2.0-prerelease.20220505110517", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", + "integrity": "sha512-c9APpwYegenR0D7XgqGhSe0okn1n26tgTagCkQ3KVl6wrYYKjhkw3xoMPgod4eXzjhkTmdNR7GsKRvJyvrLhig==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -51340,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220504172200", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220504172200.tgz", - "integrity": "sha512-xSoSgKRX3CLFz0uANmvHlGgw9ew4cj4WVanPTXlvfpCZ2pPdHwNwd4Z94nMWPgVFhICkZTBEeWixhJa9LCCfow==", + "version": "0.2.0-prerelease.20220505153212", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220505153212.tgz", + "integrity": "sha512-P2IPZztzCaiGblQtPEzh/iIipYLV2pc78/JIz/feqjdQT4WrRnJ6b0TJDJAICvY6F9f7DJbHQtP9vGvOA+gmPQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 979d3600e..b28e1e351 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220505121826", + "scratch-gui": "0.1.0-prerelease.20220505205652", "scratch-l10n": "3.14.20220505031611", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 52127bb3b938ba59b9dcfbfbbb4d49963fd1409e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 May 2022 05:31:02 +0000 Subject: [PATCH 19/44] chore(deps): update dependency scratch-l10n to v3.14.20220506031605 --- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6612cafb2..b9af74295 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220505205652", - "scratch-l10n": "3.14.20220505031611", + "scratch-l10n": "3.14.20220506031605", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -22861,6 +22861,22 @@ "scratch-l10n": "3.14.20220505031611" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "0.1.0-prerelease.20220505205652", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505205652.tgz", @@ -23211,6 +23227,22 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220505110517", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", @@ -23314,9 +23346,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -50736,6 +50768,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20220505031611" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51034,6 +51080,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220505031611", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", + "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "0.2.0-prerelease.20220505110517", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", @@ -51118,9 +51176,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index b28e1e351..b29fa2abd 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220505205652", - "scratch-l10n": "3.14.20220505031611", + "scratch-l10n": "3.14.20220506031605", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From af7fa38149bef8f5e6527835003dd86e416dbd71 Mon Sep 17 00:00:00 2001 From: seotts Date: Fri, 6 May 2022 10:39:58 -0400 Subject: [PATCH 20/44] Strategic Framework alignment and spacing --- .../annual-report/2021/annual-report.jsx | 8 ++--- .../annual-report/2021/annual-report.scss | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index d5e1fdb97..d0b183c00 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -2059,22 +2059,22 @@ class AnnualReport extends React.Component {

-
-
+
+
{this.props.intl.formatMessage({id:
-
+
{this.props.intl.formatMessage({id:
-
+
{this.props.intl.formatMessage({id: Date: Fri, 6 May 2022 11:08:37 -0400 Subject: [PATCH 21/44] In-kind symbol alignment --- src/views/annual-report/2021/annual-report.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 571b3ec9b..d0d779244 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -2638,7 +2638,7 @@ p.contain-p{ .in-kind{ display: inline-block; - margin: 0 0 0 5px; + margin: 0 0 1px 5px; width: 8px; height: 8px; border-radius: 8px; From a22da02cc22630d6ac117a993c667516c2581e73 Mon Sep 17 00:00:00 2001 From: seotts Date: Fri, 6 May 2022 13:06:17 -0400 Subject: [PATCH 22/44] Bold pull quotes --- src/views/annual-report/2021/annual-report.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index d0d779244..0b48fa84b 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -291,6 +291,7 @@ a, a:link, a:visited, a:active{ line-height: 2rem; text-align: left; margin-bottom: 40px; + font-weight: bold; @media #{$small}{ font-size: 24px; } From c2d277ed73c8a41d7db68ca84db64b670d863758 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 May 2022 19:23:48 +0000 Subject: [PATCH 23/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220506190050 --- package-lock.json | 128 +++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 36 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9af74295..1580ac493 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220505205652", + "scratch-gui": "0.1.0-prerelease.20220506190050", "scratch-l10n": "3.14.20220506031605", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22850,37 +22850,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20220505120102", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220505120102.tgz", - "integrity": "sha512-mYzYYCQpS/FGYc5ISLOLI4E5pJVYa5OKeboBIeNkGdZ0DbyS8A8e99ASnF6S5S162QYAaFx+El+ItHPEzfzz9g==", + "version": "0.1.0-prerelease.20220506053418", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220506053418.tgz", + "integrity": "sha512-C3oLu20+AJyhlqTE1tBqTdFp1Y+o7A1Ec1iYHn1h2T41Co78YchbbpCbQ1i1MuwvdMQStKA1EtTnptTf5BDIaA==", "dev": true, "dependencies": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220505031611" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.14.20220506031605" } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220505205652", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505205652.tgz", - "integrity": "sha512-TkVJcQsEKdl2Tgwbv1GEab070L+W8bzT9f3GXgNkeBtPaAVDT9SezOQyFMbVtVuGP/XCedSQfhQlOkiYWUt06w==", + "version": "0.1.0-prerelease.20220506190050", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220506190050.tgz", + "integrity": "sha512-P65LeO2BT4pQIGb4eJc75EmY4cWL0dyBM8pqKmjo1ECH4b+WqTXurXnOm9YVSfEVAFIWNPe4Zrvg1C1F0xwKPg==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22931,14 +22915,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220505120102", - "scratch-l10n": "3.14.20220505031611", - "scratch-paint": "0.2.0-prerelease.20220505110517", + "scratch-blocks": "0.1.0-prerelease.20220506053418", + "scratch-l10n": "3.14.20220506031605", + "scratch-paint": "0.2.0-prerelease.20220506101920", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220505153212", + "scratch-vm": "0.2.0-prerelease.20220506115922", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23227,26 +23211,10 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "0.2.0-prerelease.20220505110517", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", - "integrity": "sha512-c9APpwYegenR0D7XgqGhSe0okn1n26tgTagCkQ3KVl6wrYYKjhkw3xoMPgod4eXzjhkTmdNR7GsKRvJyvrLhig==", + "version": "0.2.0-prerelease.20220506101920", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", + "integrity": "sha512-e1vBGm3jYlh8XNIDMBp0OEHZstm195NcdCaIa4s+eJ0vNo5Q56zQQdj1PPCdQmPOoyi/7I4SGdXrK+wee3NcYQ==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -23544,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220505153212", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220505153212.tgz", - "integrity": "sha512-P2IPZztzCaiGblQtPEzh/iIipYLV2pc78/JIz/feqjdQT4WrRnJ6b0TJDJAICvY6F9f7DJbHQtP9vGvOA+gmPQ==", + "version": "0.2.0-prerelease.20220506115922", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220506115922.tgz", + "integrity": "sha512-ClO7CT2qjCrlSt0drNXXzSeK3tJy8shIK0IFG6LhVOHuaw3nU+jUvpjDVshihsxCQPgDxt0Ifc0Ned16fqH4iA==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50759,35 +50727,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220505120102", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220505120102.tgz", - "integrity": "sha512-mYzYYCQpS/FGYc5ISLOLI4E5pJVYa5OKeboBIeNkGdZ0DbyS8A8e99ASnF6S5S162QYAaFx+El+ItHPEzfzz9g==", + "version": "0.1.0-prerelease.20220506053418", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220506053418.tgz", + "integrity": "sha512-C3oLu20+AJyhlqTE1tBqTdFp1Y+o7A1Ec1iYHn1h2T41Co78YchbbpCbQ1i1MuwvdMQStKA1EtTnptTf5BDIaA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220505031611" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.14.20220506031605" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220505205652", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220505205652.tgz", - "integrity": "sha512-TkVJcQsEKdl2Tgwbv1GEab070L+W8bzT9f3GXgNkeBtPaAVDT9SezOQyFMbVtVuGP/XCedSQfhQlOkiYWUt06w==", + "version": "0.1.0-prerelease.20220506190050", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220506190050.tgz", + "integrity": "sha512-P65LeO2BT4pQIGb4eJc75EmY4cWL0dyBM8pqKmjo1ECH4b+WqTXurXnOm9YVSfEVAFIWNPe4Zrvg1C1F0xwKPg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50838,14 +50792,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220505120102", - "scratch-l10n": "3.14.20220505031611", - "scratch-paint": "0.2.0-prerelease.20220505110517", + "scratch-blocks": "0.1.0-prerelease.20220506053418", + "scratch-l10n": "3.14.20220506031605", + "scratch-paint": "0.2.0-prerelease.20220506101920", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220505153212", + "scratch-vm": "0.2.0-prerelease.20220506115922", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51080,22 +51034,10 @@ "symbol-observable": "^1.0.3" } }, - "scratch-l10n": { - "version": "3.14.20220505031611", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220505031611.tgz", - "integrity": "sha512-wRy4aH657kj5zXHdr5ExT+Simff940wcFxnsYKgNoPbOiDrPwTAsQiSw9QznNzPtW6F+LQLF2R3WME+AATz97w==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-paint": { - "version": "0.2.0-prerelease.20220505110517", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220505110517.tgz", - "integrity": "sha512-c9APpwYegenR0D7XgqGhSe0okn1n26tgTagCkQ3KVl6wrYYKjhkw3xoMPgod4eXzjhkTmdNR7GsKRvJyvrLhig==", + "version": "0.2.0-prerelease.20220506101920", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", + "integrity": "sha512-e1vBGm3jYlh8XNIDMBp0OEHZstm195NcdCaIa4s+eJ0vNo5Q56zQQdj1PPCdQmPOoyi/7I4SGdXrK+wee3NcYQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -51368,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220505153212", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220505153212.tgz", - "integrity": "sha512-P2IPZztzCaiGblQtPEzh/iIipYLV2pc78/JIz/feqjdQT4WrRnJ6b0TJDJAICvY6F9f7DJbHQtP9vGvOA+gmPQ==", + "version": "0.2.0-prerelease.20220506115922", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220506115922.tgz", + "integrity": "sha512-ClO7CT2qjCrlSt0drNXXzSeK3tJy8shIK0IFG6LhVOHuaw3nU+jUvpjDVshihsxCQPgDxt0Ifc0Ned16fqH4iA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index b29fa2abd..d85d40e0f 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220505205652", + "scratch-gui": "0.1.0-prerelease.20220506190050", "scratch-l10n": "3.14.20220506031605", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 3e287d41e0386ee3808264a0de766d7fafbc1205 Mon Sep 17 00:00:00 2001 From: seotts Date: Fri, 6 May 2022 16:41:35 -0400 Subject: [PATCH 24/44] Use larger fort (18px) for some paragraphs, per spec --- .../text-and-media-snippet.jsx | 29 ++++++---- .../text-and-media-snippet.scss | 4 ++ .../annual-report/2021/annual-report.jsx | 57 +++++++++++-------- .../annual-report/2021/annual-report.scss | 2 +- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/src/components/text-and-media-snippet/text-and-media-snippet.jsx b/src/components/text-and-media-snippet/text-and-media-snippet.jsx index 692c83856..378f016e7 100644 --- a/src/components/text-and-media-snippet/text-and-media-snippet.jsx +++ b/src/components/text-and-media-snippet/text-and-media-snippet.jsx @@ -19,12 +19,16 @@ const TextAndMediaSnippet = props => (

{props.title}

{props.children.length > 0 ?
- {/* eslint-disable */} - {props.children.map((paragraph, i) => { - return

{paragraph}

; - })} + {props.children.map((paragraph, i) => ( +

+ {paragraph} +

+ ))}
: -

+

{props.children}

} @@ -103,14 +107,15 @@ const TextAndMediaSnippet = props => ( ); TextAndMediaSnippet.propTypes = { - children: PropTypes.node, - title: PropTypes.string, - largeImage: PropTypes.string, - className: PropTypes.string, - videoId: PropTypes.string, - type: PropTypes.string, alt: PropTypes.string, - spinnerColor: PropTypes.string + children: PropTypes.node, + className: PropTypes.string, + largeImage: PropTypes.string, + firstPBig: PropTypes.bool, + spinnerColor: PropTypes.string, + title: PropTypes.string, + type: PropTypes.string, + videoId: PropTypes.string }; module.exports = TextAndMediaSnippet; diff --git a/src/components/text-and-media-snippet/text-and-media-snippet.scss b/src/components/text-and-media-snippet/text-and-media-snippet.scss index 690c9ab46..3ea422eab 100644 --- a/src/components/text-and-media-snippet/text-and-media-snippet.scss +++ b/src/components/text-and-media-snippet/text-and-media-snippet.scss @@ -116,6 +116,10 @@ font-size: 1rem; text-align: left; + &.p-big { + font-size: 1.125rem; + } + @media #{$intermediate-and-smaller} { text-align: center; } diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index d0b183c00..d98e42292 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -441,15 +441,15 @@ class AnnualReport extends React.Component {

-

+

-

+

-

+

@@ -461,25 +461,25 @@ class AnnualReport extends React.Component {

-

+

-

+

-

+

-

+

{/* eslint-enable max-len */}
@@ -494,7 +494,7 @@ class AnnualReport extends React.Component {

-

+

@@ -603,7 +603,7 @@ class AnnualReport extends React.Component { id="annualReport.2021.reachSaudiArabiaTitle" />

-

+

@@ -644,7 +644,7 @@ class AnnualReport extends React.Component { /> -

+

@@ -765,7 +765,7 @@ class AnnualReport extends React.Component {

-

+

@@ -797,7 +797,7 @@ class AnnualReport extends React.Component {
-

+

{this.props.intl.formatMessage(

-

+

@@ -902,7 +902,7 @@ class AnnualReport extends React.Component { {/* eslint-enable max-len */}

-

+

@@ -926,7 +926,7 @@ class AnnualReport extends React.Component {

-

+

@@ -1067,7 +1067,7 @@ class AnnualReport extends React.Component { {/* eslint-disable max-len */}

-

+

@@ -1429,6 +1439,7 @@ class AnnualReport extends React.Component { )} type="image" largeImage="/images/annual-report/2021/3_Community Section/Languages illustration.svg" + firstPBig > -

+

@@ -1805,7 +1816,7 @@ class AnnualReport extends React.Component {
-

+

@@ -1843,7 +1854,7 @@ class AnnualReport extends React.Component { minWidth={frameless.tabletPortrait} >

-

+

{/* eslint-disable max-len */} {/* eslint-enable max-len */} @@ -1883,7 +1894,7 @@ class AnnualReport extends React.Component { maxWidth={frameless.tabletPortrait - 1} >

-

+

{/* eslint-disable max-len */} {/* eslint-enable max-len */} @@ -1949,7 +1960,7 @@ class AnnualReport extends React.Component { {/* eslint-enable max-len */}

-

+

@@ -2095,7 +2106,7 @@ class AnnualReport extends React.Component {

-

+

diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 0b48fa84b..8d75ecb78 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1780,7 +1780,7 @@ img.comment-viz{ padding: 0 15px; } p.subhed{ - font-size: 1.1rem; + font-size: 1.125rem; max-width: 500px; margin: 15px auto; } From ca15b64e19e4534ec2564fc47b939e400a6b99f1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 May 2022 03:50:36 +0000 Subject: [PATCH 25/44] chore(deps): update dependency scratch-l10n to v3.14.20220507031549 --- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1580ac493..c0d2a5ae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220506190050", - "scratch-l10n": "3.14.20220506031605", + "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -22861,6 +22861,22 @@ "scratch-l10n": "3.14.20220506031605" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "0.1.0-prerelease.20220506190050", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220506190050.tgz", @@ -23211,6 +23227,22 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220506101920", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", @@ -23314,9 +23346,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -50736,6 +50768,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20220506031605" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51034,6 +51080,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220506031605", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", + "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "0.2.0-prerelease.20220506101920", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", @@ -51118,9 +51176,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d85d40e0f..abf37762c 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220506190050", - "scratch-l10n": "3.14.20220506031605", + "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From a35927ae6aa829e17639c8a642fcf2b26697ffd6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 May 2022 20:16:55 +0000 Subject: [PATCH 26/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220507192235 --- package-lock.json | 128 +++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 36 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0d2a5ae5..fa51150e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220506190050", + "scratch-gui": "0.1.0-prerelease.20220507192235", "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22850,37 +22850,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20220506053418", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220506053418.tgz", - "integrity": "sha512-C3oLu20+AJyhlqTE1tBqTdFp1Y+o7A1Ec1iYHn1h2T41Co78YchbbpCbQ1i1MuwvdMQStKA1EtTnptTf5BDIaA==", + "version": "0.1.0-prerelease.20220507112727", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220507112727.tgz", + "integrity": "sha512-a961pOBlTehlVF1DRTZYlpoTQHG+izhIJUDG+5MRzH85M2aenpyrnu3i/yUjXzXCUYvQ7fI27I0ZJyqSGVXZ9w==", "dev": true, "dependencies": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220506031605" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.14.20220507031549" } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220506190050", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220506190050.tgz", - "integrity": "sha512-P65LeO2BT4pQIGb4eJc75EmY4cWL0dyBM8pqKmjo1ECH4b+WqTXurXnOm9YVSfEVAFIWNPe4Zrvg1C1F0xwKPg==", + "version": "0.1.0-prerelease.20220507192235", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220507192235.tgz", + "integrity": "sha512-YmaJ1kdFdkXzbfy/ChQVdoLzSZftSBZhWKfD5lswjeMPANIPYf/o6kEDJcwpu/E64QxTX/CoD7RsvLC3pvsAKA==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22931,14 +22915,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220506053418", - "scratch-l10n": "3.14.20220506031605", - "scratch-paint": "0.2.0-prerelease.20220506101920", + "scratch-blocks": "0.1.0-prerelease.20220507112727", + "scratch-l10n": "3.14.20220507031549", + "scratch-paint": "0.2.0-prerelease.20220507092357", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220506115922", + "scratch-vm": "0.2.0-prerelease.20220507103119", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23227,26 +23211,10 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "0.2.0-prerelease.20220506101920", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", - "integrity": "sha512-e1vBGm3jYlh8XNIDMBp0OEHZstm195NcdCaIa4s+eJ0vNo5Q56zQQdj1PPCdQmPOoyi/7I4SGdXrK+wee3NcYQ==", + "version": "0.2.0-prerelease.20220507092357", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", + "integrity": "sha512-WBeUASFfkiKoK4x4s3zyt+P5yscqJrRoXa19GNeDlqBMaE7TgReukNlaPvFpNUpyJFASPDlZ1cTWgAyp0bPeUA==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -23544,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220506115922", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220506115922.tgz", - "integrity": "sha512-ClO7CT2qjCrlSt0drNXXzSeK3tJy8shIK0IFG6LhVOHuaw3nU+jUvpjDVshihsxCQPgDxt0Ifc0Ned16fqH4iA==", + "version": "0.2.0-prerelease.20220507103119", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220507103119.tgz", + "integrity": "sha512-3N06+bYoScMLXxSoid8S5vDagrGEBd2kJ24gz4Q+ZyWtNqX2uJadK1fvuwJfHV7TaOTfwSnxiUQKUdJUgCAOsw==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50759,35 +50727,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220506053418", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220506053418.tgz", - "integrity": "sha512-C3oLu20+AJyhlqTE1tBqTdFp1Y+o7A1Ec1iYHn1h2T41Co78YchbbpCbQ1i1MuwvdMQStKA1EtTnptTf5BDIaA==", + "version": "0.1.0-prerelease.20220507112727", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220507112727.tgz", + "integrity": "sha512-a961pOBlTehlVF1DRTZYlpoTQHG+izhIJUDG+5MRzH85M2aenpyrnu3i/yUjXzXCUYvQ7fI27I0ZJyqSGVXZ9w==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220506031605" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.14.20220507031549" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220506190050", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220506190050.tgz", - "integrity": "sha512-P65LeO2BT4pQIGb4eJc75EmY4cWL0dyBM8pqKmjo1ECH4b+WqTXurXnOm9YVSfEVAFIWNPe4Zrvg1C1F0xwKPg==", + "version": "0.1.0-prerelease.20220507192235", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220507192235.tgz", + "integrity": "sha512-YmaJ1kdFdkXzbfy/ChQVdoLzSZftSBZhWKfD5lswjeMPANIPYf/o6kEDJcwpu/E64QxTX/CoD7RsvLC3pvsAKA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50838,14 +50792,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220506053418", - "scratch-l10n": "3.14.20220506031605", - "scratch-paint": "0.2.0-prerelease.20220506101920", + "scratch-blocks": "0.1.0-prerelease.20220507112727", + "scratch-l10n": "3.14.20220507031549", + "scratch-paint": "0.2.0-prerelease.20220507092357", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220506115922", + "scratch-vm": "0.2.0-prerelease.20220507103119", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51080,22 +51034,10 @@ "symbol-observable": "^1.0.3" } }, - "scratch-l10n": { - "version": "3.14.20220506031605", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220506031605.tgz", - "integrity": "sha512-RN/r4VR+3Yq/kIIAnQtPShfYvDmnmIcTglhh2mx7FMWVB22QpuV9TEpiEBO9Y3HQjdan+lWAMsE7PP/N0tpBPQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-paint": { - "version": "0.2.0-prerelease.20220506101920", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220506101920.tgz", - "integrity": "sha512-e1vBGm3jYlh8XNIDMBp0OEHZstm195NcdCaIa4s+eJ0vNo5Q56zQQdj1PPCdQmPOoyi/7I4SGdXrK+wee3NcYQ==", + "version": "0.2.0-prerelease.20220507092357", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", + "integrity": "sha512-WBeUASFfkiKoK4x4s3zyt+P5yscqJrRoXa19GNeDlqBMaE7TgReukNlaPvFpNUpyJFASPDlZ1cTWgAyp0bPeUA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -51368,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220506115922", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220506115922.tgz", - "integrity": "sha512-ClO7CT2qjCrlSt0drNXXzSeK3tJy8shIK0IFG6LhVOHuaw3nU+jUvpjDVshihsxCQPgDxt0Ifc0Ned16fqH4iA==", + "version": "0.2.0-prerelease.20220507103119", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220507103119.tgz", + "integrity": "sha512-3N06+bYoScMLXxSoid8S5vDagrGEBd2kJ24gz4Q+ZyWtNqX2uJadK1fvuwJfHV7TaOTfwSnxiUQKUdJUgCAOsw==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index abf37762c..2c6245913 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220506190050", + "scratch-gui": "0.1.0-prerelease.20220507192235", "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 528b6a2405e08f130f8a6e3225cd2d38afdf4ebc Mon Sep 17 00:00:00 2001 From: seotts Date: Fri, 6 May 2022 16:53:19 -0400 Subject: [PATCH 27/44] Color/width/alignment in founder message & overall h2 size --- src/views/annual-report/2021/annual-report.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 8d75ecb78..aada85c95 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -35,7 +35,7 @@ h1 { } h2 { - font-size: 2.9rem; + font-size: 2.5rem; line-height: 3.2rem; } @@ -2290,7 +2290,7 @@ img.comment-viz{ width: 100%; color: $ui-white; - h2, p { + h2, h4, p { color: $ui-white; } @@ -2308,14 +2308,14 @@ img.comment-viz{ } } .text{ - width: 60%; + width: 620px; } @media #{$intermediate-and-smaller}{ flex-direction: column; .header, .text{ width: 100%; } - p{ + p, h2, h4 { text-align: left; } } From 0854825136a717567dc1f256334916acc0d13075 Mon Sep 17 00:00:00 2001 From: seotts Date: Fri, 6 May 2022 17:00:00 -0400 Subject: [PATCH 28/44] Director message alignment --- src/views/annual-report/2021/annual-report.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index aada85c95..0288c48aa 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -197,6 +197,12 @@ a, a:link, a:visited, a:active{ max-width: 300px; overflow-wrap: break-word; } + + p { + &:first-of-type{ + margin-top: 0; + } + } } @media #{$intermediate-and-smaller} { From d6baafa181563d84592e764ce8fee4d2478b7d23 Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 10:37:27 -0400 Subject: [PATCH 29/44] Make masthead/director message breakpoint consistant --- src/views/annual-report/2021/annual-report.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 0288c48aa..82c142d1e 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -5,8 +5,6 @@ $base-bg: $ui-white; $annual-report-aqua: #088763; $annual-report-green: #2B732B; $annual-report-teal: #297EA4; -$masthead-breakpoint: "only screen and (max-width : 960px)"; -$masthead-breakpoint-wave: "only screen and (max-width : 1060px)"; $timeline-breakpoint: "only screen and (max-width : 1030px)"; $ui-purple-dark: hsla(260, 55%, 55%, 1); @@ -117,7 +115,7 @@ a, a:link, a:visited, a:active{ color: $ui-white; } - @media #{$masthead-breakpoint} { + @media #{$intermediate-and-smaller} { .inner { width: 100%; } @@ -149,7 +147,7 @@ a, a:link, a:visited, a:active{ } } - @media #{$masthead-breakpoint} { + @media #{$intermediate-and-smaller} { flex-direction: column; align-items: center; From 4bfe9e67a307ce372cb5f268357ec59a63da0437 Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 11:48:52 -0400 Subject: [PATCH 30/44] Fix bridges to science title copy --- src/views/annual-report/2021/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/annual-report/2021/l10n.json b/src/views/annual-report/2021/l10n.json index 437363e73..e04a2e6b1 100644 --- a/src/views/annual-report/2021/l10n.json +++ b/src/views/annual-report/2021/l10n.json @@ -82,7 +82,7 @@ "annualReport.2021.spotlightStory": "Spotlight Story", - "annualReport.2021.SECSpotlightTitle": "Bridges to Science Spotlight", + "annualReport.2021.SECSpotlightTitle": "Bridges to Science", "annualReport.2021.SECSpotlightLocation": "Fulshear, Texas", "annualReport.2021.SECSpotlightText1": "Bridges to Science; a Texas-based nonprofit providing math, coding, and robotics programs for underserved youth; was one of 41 exceptional organizations to join the Scratch Education Collaborative's first cohort.", "annualReport.2021.SECSpotlightText2": "In 2021, we supported Bridges to Science in facilitating their first “Hour of Code” workshop with Code.org.", From 52eb20cdaeb85e8fc8943f0fefa2d73e11f6fdcd Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 11:59:34 -0400 Subject: [PATCH 31/44] Bridges to Science location bolded --- src/views/annual-report/2021/annual-report.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index d98e42292..ed12559b4 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -850,7 +850,9 @@ class AnnualReport extends React.Component {

- + + +

@@ -888,7 +890,9 @@ class AnnualReport extends React.Component {

- + + +

From f8cc0a6e9d881235a313cc23bed8a557fa970abd Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 12:17:05 -0400 Subject: [PATCH 32/44] =?UTF-8?q?Remove=20bananas=20=F0=9F=8D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../text-and-media-snippet/text-and-media-snippet.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/text-and-media-snippet/text-and-media-snippet.jsx b/src/components/text-and-media-snippet/text-and-media-snippet.jsx index 378f016e7..46a5d60b9 100644 --- a/src/components/text-and-media-snippet/text-and-media-snippet.jsx +++ b/src/components/text-and-media-snippet/text-and-media-snippet.jsx @@ -28,7 +28,7 @@ const TextAndMediaSnippet = props => (

))}
: -

+

{props.children}

} From 65c9588aae3ab8df5aad02ab320576bfb445b8cf Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 14:27:03 -0400 Subject: [PATCH 33/44] Switch /annual-report to 2021 report! --- src/routes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes.json b/src/routes.json index 82d57f4f7..12b35ec39 100644 --- a/src/routes.json +++ b/src/routes.json @@ -10,9 +10,9 @@ "name": "annual-report", "pattern": "^/annual-report/?(\\?.*)?$", "routeAlias": "/annual-report/?$", - "view": "annual-report/2020/annual-report", - "title": "Annual Report 2020", - "intlName": "annual-report-2020", + "view": "annual-report/2021/annual-report", + "title": "Annual Report 2021", + "intlName": "annual-report-2021", "viewportWidth": "device-width" }, { From 3750166b4fd73b9237b7182a5f87fe5a736a83a6 Mon Sep 17 00:00:00 2001 From: seotts Date: Mon, 9 May 2022 16:35:52 -0400 Subject: [PATCH 34/44] Use h3 in a bunch of spots instead of h4 --- .../annual-report/2021/annual-report.jsx | 58 +++++++++---------- .../annual-report/2021/annual-report.scss | 26 +++++---- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index ed12559b4..be1fb38da 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -437,7 +437,7 @@ class AnnualReport extends React.Component { ref={this.setRef(SECTIONS.mission)} >
-

+

@@ -491,9 +491,9 @@ class AnnualReport extends React.Component {
-

+

-

+

@@ -762,9 +762,9 @@ class AnnualReport extends React.Component {
-

+

-

+

@@ -846,9 +846,9 @@ class AnnualReport extends React.Component { color="blue" type="spotlight" /> -

+

-

+

@@ -886,9 +886,9 @@ class AnnualReport extends React.Component { color="blue" type="spotlight" /> -

+

-

+

@@ -927,15 +927,15 @@ class AnnualReport extends React.Component {

-

+

-

+

-

+

-

+ -

+

-

+

{/* eslint-disable max-len */} {/* eslint-disable max-len */} -

+

-

+
-

+

-

+

@@ -1320,7 +1320,7 @@ class AnnualReport extends React.Component { {/* eslint-disable max-len */} {/* eslint-disable max-len */} -

+

-

+

-

+

-

+ {/* eslint-disable max-len */}
-

+

-

+ @@ -1850,9 +1850,9 @@ class AnnualReport extends React.Component {
-

+

-

+
Date: Mon, 9 May 2022 17:04:36 -0400 Subject: [PATCH 35/44] Fix wrapping and padding of SEC blob p --- src/views/annual-report/2021/annual-report.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 5fbd11c90..b685de130 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1013,6 +1013,7 @@ img.comment-viz{ justify-content: center; align-items: center; text-align: center; + margin-left: 4px; } .three-pillars { @@ -1029,7 +1030,7 @@ img.comment-viz{ @media #{$big} { .three-pillars { .pillar-splash { - width: 244px; + width: 228px; height: 160px; } } @@ -1048,7 +1049,7 @@ img.comment-viz{ .three-pillars { .pillar-splash { - width: 198px; + width: 188px; height: 128px; } } @@ -1070,13 +1071,13 @@ img.comment-viz{ h4 { - font-size: 1.1rem; + font-size: 1rem; line-height: 1.3; } .three-pillars { .pillar-splash { - width: 151px; + width: 142px; height: 89px; &.community { @@ -1098,9 +1099,10 @@ img.comment-viz{ .three-pillars { .pillar-splash { - width: 95px; + width: 92px; height: 64px; margin-bottom: 0px; + margin-left: 2px; &.community { width: 108px; From 524155cabd7e9b8512081c4fbecb06a795f3b934 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 May 2022 00:53:13 +0000 Subject: [PATCH 36/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220509222850 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa51150e7..29c4c0cfa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220507192235", + "scratch-gui": "0.1.0-prerelease.20220509222850", "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22862,9 +22862,9 @@ } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220507192235", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220507192235.tgz", - "integrity": "sha512-YmaJ1kdFdkXzbfy/ChQVdoLzSZftSBZhWKfD5lswjeMPANIPYf/o6kEDJcwpu/E64QxTX/CoD7RsvLC3pvsAKA==", + "version": "0.1.0-prerelease.20220509222850", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220509222850.tgz", + "integrity": "sha512-QZhzRy912Lc1fj3jAO1f3PNtZNEdcAEu87TXdCYaSIIWgAdSJeNz3G4LSpbn+pVwbuNJrfdKDINEThYc5vpcZQ==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22920,7 +22920,7 @@ "scratch-paint": "0.2.0-prerelease.20220507092357", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", - "scratch-storage": "1.3.5", + "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", "scratch-vm": "0.2.0-prerelease.20220507103119", "startaudiocontext": "1.2.1", @@ -23247,9 +23247,9 @@ "dev": true }, "node_modules/scratch-gui/node_modules/scratch-storage": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", - "integrity": "sha512-MrIRidvUJtncx0xlMJDng9KypHR3/kyCE2stXJ1CYNLTWrl2pGCpNNcYWygRQw7aFQ0hIzP/Z118T8X53sUDAA==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.6.tgz", + "integrity": "sha512-L/7z7SB7cGANsgjyiE+qZNaPEqFHK1yPbNomizkgN3WHGcKRogLvmheR57kOxHNpQzodUTbG+pVVH6fR2ZY1Sg==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.3", @@ -50739,9 +50739,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220507192235", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220507192235.tgz", - "integrity": "sha512-YmaJ1kdFdkXzbfy/ChQVdoLzSZftSBZhWKfD5lswjeMPANIPYf/o6kEDJcwpu/E64QxTX/CoD7RsvLC3pvsAKA==", + "version": "0.1.0-prerelease.20220509222850", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220509222850.tgz", + "integrity": "sha512-QZhzRy912Lc1fj3jAO1f3PNtZNEdcAEu87TXdCYaSIIWgAdSJeNz3G4LSpbn+pVwbuNJrfdKDINEThYc5vpcZQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50797,7 +50797,7 @@ "scratch-paint": "0.2.0-prerelease.20220507092357", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", - "scratch-storage": "1.3.5", + "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", "scratch-vm": "0.2.0-prerelease.20220507103119", "startaudiocontext": "1.2.1", @@ -51059,9 +51059,9 @@ } }, "scratch-storage": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", - "integrity": "sha512-MrIRidvUJtncx0xlMJDng9KypHR3/kyCE2stXJ1CYNLTWrl2pGCpNNcYWygRQw7aFQ0hIzP/Z118T8X53sUDAA==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.6.tgz", + "integrity": "sha512-L/7z7SB7cGANsgjyiE+qZNaPEqFHK1yPbNomizkgN3WHGcKRogLvmheR57kOxHNpQzodUTbG+pVVH6fR2ZY1Sg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.3", diff --git a/package.json b/package.json index 2c6245913..d8f2fde32 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220507192235", + "scratch-gui": "0.1.0-prerelease.20220509222850", "scratch-l10n": "3.14.20220507031549", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 6ba974e7ee36f83e2a23b82d3b5b5e703c75b6d9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 May 2022 03:31:00 +0000 Subject: [PATCH 37/44] chore(deps): update dependency scratch-l10n to v3.14.20220510031559 --- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29c4c0cfa..add938ac3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220509222850", - "scratch-l10n": "3.14.20220507031549", + "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -22861,6 +22861,22 @@ "scratch-l10n": "3.14.20220507031549" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "0.1.0-prerelease.20220509222850", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220509222850.tgz", @@ -23211,6 +23227,22 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220507092357", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", @@ -23314,9 +23346,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -50736,6 +50768,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20220507031549" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51034,6 +51080,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220507031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", + "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "0.2.0-prerelease.20220507092357", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", @@ -51118,9 +51176,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d8f2fde32..4924b5f90 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220509222850", - "scratch-l10n": "3.14.20220507031549", + "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 57650fdf56fba53a42520cb6fdaa0e1dcce9536d Mon Sep 17 00:00:00 2001 From: seotts Date: Tue, 10 May 2022 11:32:47 -0400 Subject: [PATCH 38/44] Clean up Bridges to Science spotlight --- src/views/annual-report/2021/annual-report.jsx | 2 +- src/views/annual-report/2021/annual-report.scss | 14 ++++++++++++-- src/views/annual-report/2021/l10n.json | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.jsx b/src/views/annual-report/2021/annual-report.jsx index be1fb38da..4a129dfde 100644 --- a/src/views/annual-report/2021/annual-report.jsx +++ b/src/views/annual-report/2021/annual-report.jsx @@ -1339,7 +1339,7 @@ class AnnualReport extends React.Component { {/* eslint-disable max-len */} Date: Tue, 10 May 2022 11:56:03 -0400 Subject: [PATCH 39/44] Update illustrations to remove lines --- .../2_Access Section/Access Spotlight Story Illustration.svg | 4 ++-- .../Equity x Design Committee Illustration.svg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/images/annual-report/2021/2_Access Section/Access Spotlight Story Illustration.svg b/static/images/annual-report/2021/2_Access Section/Access Spotlight Story Illustration.svg index 1431628bc..c3fa3b66f 100644 --- a/static/images/annual-report/2021/2_Access Section/Access Spotlight Story Illustration.svg +++ b/static/images/annual-report/2021/2_Access Section/Access Spotlight Story Illustration.svg @@ -18,12 +18,12 @@ - + - + diff --git a/static/images/annual-report/2021/2_Access Section/Equity x Design Committee Illustration.svg b/static/images/annual-report/2021/2_Access Section/Equity x Design Committee Illustration.svg index 12abbefac..f0c75f52a 100644 --- a/static/images/annual-report/2021/2_Access Section/Equity x Design Committee Illustration.svg +++ b/static/images/annual-report/2021/2_Access Section/Equity x Design Committee Illustration.svg @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + From 6dad747671d52ca4c2dd1942fc045e0a00a74590 Mon Sep 17 00:00:00 2001 From: seotts Date: Tue, 10 May 2022 12:00:44 -0400 Subject: [PATCH 40/44] Add margin to reach intro for small screens --- src/views/annual-report/2021/annual-report.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 4798c3e09..ddc5f703f 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -647,6 +647,10 @@ a, a:link, a:visited, a:active{ .hed{ max-width: 620px; margin: auto; + + @media #{$small} { + margin: auto 8px; + } } .reach-numbers { From 7be9fb656cd1289b6fef60d8e8f8d4dc37e123f5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 May 2022 16:02:58 +0000 Subject: [PATCH 41/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220510153809 --- package-lock.json | 128 +++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 36 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index add938ac3..55e34a7ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220509222850", + "scratch-gui": "0.1.0-prerelease.20220510153809", "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22850,37 +22850,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20220507112727", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220507112727.tgz", - "integrity": "sha512-a961pOBlTehlVF1DRTZYlpoTQHG+izhIJUDG+5MRzH85M2aenpyrnu3i/yUjXzXCUYvQ7fI27I0ZJyqSGVXZ9w==", + "version": "0.1.0-prerelease.20220510060607", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220510060607.tgz", + "integrity": "sha512-mpI73aZlzntkDVYH2P5PtEb5/CTCcVzBNhSri5dgk4LTzMAomm4gcBHOHeYCDQSmqUItrZ788c3InR1viFyHQA==", "dev": true, "dependencies": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220507031549" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.14.20220510031559" } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220509222850", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220509222850.tgz", - "integrity": "sha512-QZhzRy912Lc1fj3jAO1f3PNtZNEdcAEu87TXdCYaSIIWgAdSJeNz3G4LSpbn+pVwbuNJrfdKDINEThYc5vpcZQ==", + "version": "0.1.0-prerelease.20220510153809", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220510153809.tgz", + "integrity": "sha512-bG5tFziktVuElBGC11KY3LLS9j9Ed7sklLWPPIkG841pMgsi1LRBgdoxCVbiOR5AxH94kDfNd2kOGXIQNcbGUA==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22931,14 +22915,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220507112727", - "scratch-l10n": "3.14.20220507031549", - "scratch-paint": "0.2.0-prerelease.20220507092357", + "scratch-blocks": "0.1.0-prerelease.20220510060607", + "scratch-l10n": "3.14.20220510031559", + "scratch-paint": "0.2.0-prerelease.20220510060809", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220507103119", + "scratch-vm": "0.2.0-prerelease.20220509233646", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23227,26 +23211,10 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "0.2.0-prerelease.20220507092357", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", - "integrity": "sha512-WBeUASFfkiKoK4x4s3zyt+P5yscqJrRoXa19GNeDlqBMaE7TgReukNlaPvFpNUpyJFASPDlZ1cTWgAyp0bPeUA==", + "version": "0.2.0-prerelease.20220510060809", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220510060809.tgz", + "integrity": "sha512-/aiBQGKCwI7IqbdqY+nUzNL3zYQUkwzLOhK6zJ+3NAo2MxbK6v8vBEaMkcKRjDd64szo6vOVVUXasqREW0leaw==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -23544,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220507103119", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220507103119.tgz", - "integrity": "sha512-3N06+bYoScMLXxSoid8S5vDagrGEBd2kJ24gz4Q+ZyWtNqX2uJadK1fvuwJfHV7TaOTfwSnxiUQKUdJUgCAOsw==", + "version": "0.2.0-prerelease.20220509233646", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220509233646.tgz", + "integrity": "sha512-gubus41KU7Hxpz34yBJAEQZZWTrn1upWs6Q74Fu4MYXrxZ1rWiMXZOqd174aidrIyFnzw9VJyah9YzGlyrzXjQ==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50759,35 +50727,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220507112727", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220507112727.tgz", - "integrity": "sha512-a961pOBlTehlVF1DRTZYlpoTQHG+izhIJUDG+5MRzH85M2aenpyrnu3i/yUjXzXCUYvQ7fI27I0ZJyqSGVXZ9w==", + "version": "0.1.0-prerelease.20220510060607", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220510060607.tgz", + "integrity": "sha512-mpI73aZlzntkDVYH2P5PtEb5/CTCcVzBNhSri5dgk4LTzMAomm4gcBHOHeYCDQSmqUItrZ788c3InR1viFyHQA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220507031549" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.14.20220510031559" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220509222850", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220509222850.tgz", - "integrity": "sha512-QZhzRy912Lc1fj3jAO1f3PNtZNEdcAEu87TXdCYaSIIWgAdSJeNz3G4LSpbn+pVwbuNJrfdKDINEThYc5vpcZQ==", + "version": "0.1.0-prerelease.20220510153809", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220510153809.tgz", + "integrity": "sha512-bG5tFziktVuElBGC11KY3LLS9j9Ed7sklLWPPIkG841pMgsi1LRBgdoxCVbiOR5AxH94kDfNd2kOGXIQNcbGUA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50838,14 +50792,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220507112727", - "scratch-l10n": "3.14.20220507031549", - "scratch-paint": "0.2.0-prerelease.20220507092357", + "scratch-blocks": "0.1.0-prerelease.20220510060607", + "scratch-l10n": "3.14.20220510031559", + "scratch-paint": "0.2.0-prerelease.20220510060809", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220507103119", + "scratch-vm": "0.2.0-prerelease.20220509233646", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51080,22 +51034,10 @@ "symbol-observable": "^1.0.3" } }, - "scratch-l10n": { - "version": "3.14.20220507031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220507031549.tgz", - "integrity": "sha512-qSFsKbXhC+d9Ckjr+M9VsH4WaLl6dQdmPx6+jgL9JG1d0pvu0pC01EmzBxVXSHp/VeE/rLbBg8c0Z9fGP5pw1Q==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-paint": { - "version": "0.2.0-prerelease.20220507092357", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220507092357.tgz", - "integrity": "sha512-WBeUASFfkiKoK4x4s3zyt+P5yscqJrRoXa19GNeDlqBMaE7TgReukNlaPvFpNUpyJFASPDlZ1cTWgAyp0bPeUA==", + "version": "0.2.0-prerelease.20220510060809", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220510060809.tgz", + "integrity": "sha512-/aiBQGKCwI7IqbdqY+nUzNL3zYQUkwzLOhK6zJ+3NAo2MxbK6v8vBEaMkcKRjDd64szo6vOVVUXasqREW0leaw==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -51368,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220507103119", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220507103119.tgz", - "integrity": "sha512-3N06+bYoScMLXxSoid8S5vDagrGEBd2kJ24gz4Q+ZyWtNqX2uJadK1fvuwJfHV7TaOTfwSnxiUQKUdJUgCAOsw==", + "version": "0.2.0-prerelease.20220509233646", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220509233646.tgz", + "integrity": "sha512-gubus41KU7Hxpz34yBJAEQZZWTrn1upWs6Q74Fu4MYXrxZ1rWiMXZOqd174aidrIyFnzw9VJyah9YzGlyrzXjQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 4924b5f90..58dc7d0d0 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220509222850", + "scratch-gui": "0.1.0-prerelease.20220510153809", "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 412fb2988bdf7c091ccf4f1eefcd52d42dfc1e58 Mon Sep 17 00:00:00 2001 From: seotts Date: Tue, 10 May 2022 14:14:57 -0400 Subject: [PATCH 42/44] remove unnessesary comment --- src/views/annual-report/2021/annual-report.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index ddc5f703f..67e5fd730 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -1620,9 +1620,6 @@ img.comment-viz{ .text{ max-width: 360px; } - // .images { - // max-width: 300px; - // } } } } From c9462082e968052be17dd7bc57c4adbe771a906d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 May 2022 01:00:55 +0000 Subject: [PATCH 43/44] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220511000702 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55e34a7ce..e2660b422 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220510153809", + "scratch-gui": "0.1.0-prerelease.20220511000702", "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -22862,9 +22862,9 @@ } }, "node_modules/scratch-gui": { - "version": "0.1.0-prerelease.20220510153809", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220510153809.tgz", - "integrity": "sha512-bG5tFziktVuElBGC11KY3LLS9j9Ed7sklLWPPIkG841pMgsi1LRBgdoxCVbiOR5AxH94kDfNd2kOGXIQNcbGUA==", + "version": "0.1.0-prerelease.20220511000702", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220511000702.tgz", + "integrity": "sha512-9xs1WimjgxIYgCp1oZW+Wcw+UFaz/mAL8OFZgfeY8ZXqAx42xchyYkKAkJKCO5YV7UoGm5zEYO14WM/5/dmpoA==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -22922,7 +22922,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220509233646", + "scratch-vm": "0.2.0-prerelease.20220510130158", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23512,9 +23512,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "0.2.0-prerelease.20220509233646", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220509233646.tgz", - "integrity": "sha512-gubus41KU7Hxpz34yBJAEQZZWTrn1upWs6Q74Fu4MYXrxZ1rWiMXZOqd174aidrIyFnzw9VJyah9YzGlyrzXjQ==", + "version": "0.2.0-prerelease.20220510130158", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220510130158.tgz", + "integrity": "sha512-OPNnmnRwEknNwe4MGotlqAlZwLct5gaSBOcBd7JssDXghJ05trqdHnuQWWd5wNQMlu4dPelyi6CGWRcTgwwIbA==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -50739,9 +50739,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220510153809", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220510153809.tgz", - "integrity": "sha512-bG5tFziktVuElBGC11KY3LLS9j9Ed7sklLWPPIkG841pMgsi1LRBgdoxCVbiOR5AxH94kDfNd2kOGXIQNcbGUA==", + "version": "0.1.0-prerelease.20220511000702", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220511000702.tgz", + "integrity": "sha512-9xs1WimjgxIYgCp1oZW+Wcw+UFaz/mAL8OFZgfeY8ZXqAx42xchyYkKAkJKCO5YV7UoGm5zEYO14WM/5/dmpoA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -50799,7 +50799,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.6", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220509233646", + "scratch-vm": "0.2.0-prerelease.20220510130158", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51310,9 +51310,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220509233646", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220509233646.tgz", - "integrity": "sha512-gubus41KU7Hxpz34yBJAEQZZWTrn1upWs6Q74Fu4MYXrxZ1rWiMXZOqd174aidrIyFnzw9VJyah9YzGlyrzXjQ==", + "version": "0.2.0-prerelease.20220510130158", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220510130158.tgz", + "integrity": "sha512-OPNnmnRwEknNwe4MGotlqAlZwLct5gaSBOcBd7JssDXghJ05trqdHnuQWWd5wNQMlu4dPelyi6CGWRcTgwwIbA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 58dc7d0d0..2d09ac0c6 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220510153809", + "scratch-gui": "0.1.0-prerelease.20220511000702", "scratch-l10n": "3.14.20220510031559", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From e4cdcda702c7bfbfc2f5db671e2b7e8c878f9675 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 May 2022 06:07:01 +0000 Subject: [PATCH 44/44] chore(deps): update dependency scratch-l10n to v3.14.20220511031550 --- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e2660b422..d3e6d87dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220511000702", - "scratch-l10n": "3.14.20220510031559", + "scratch-l10n": "3.14.20220511031550", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -22861,6 +22861,22 @@ "scratch-l10n": "3.14.20220510031559" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "0.1.0-prerelease.20220511000702", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220511000702.tgz", @@ -23211,6 +23227,22 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "0.2.0-prerelease.20220510060809", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220510060809.tgz", @@ -23314,9 +23346,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.14.20220510031559", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", - "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "version": "3.14.20220511031550", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220511031550.tgz", + "integrity": "sha512-ZZGfa8o8TeN+WlTk2d+M3t9I7WMM9N3y/USNW9mzn8wOlGgKQbHhh2lG1PhEypQO1mPJYbCcuxH+47KiS4RnEQ==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -50736,6 +50768,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20220510031559" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51034,6 +51080,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220510031559", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", + "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "0.2.0-prerelease.20220510060809", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220510060809.tgz", @@ -51118,9 +51176,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220510031559", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220510031559.tgz", - "integrity": "sha512-3nbZ0+1N9HnplmwTXlVv4lZ7b799JX0OMyJjWrSDET/EpCARS2oO/YTAK6Kt6xBKd7sIO2nummVT/NSosLv6cw==", + "version": "3.14.20220511031550", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220511031550.tgz", + "integrity": "sha512-ZZGfa8o8TeN+WlTk2d+M3t9I7WMM9N3y/USNW9mzn8wOlGgKQbHhh2lG1PhEypQO1mPJYbCcuxH+47KiS4RnEQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 2d09ac0c6..fbbfa0801 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "0.1.0-prerelease.20220511000702", - "scratch-l10n": "3.14.20220510031559", + "scratch-l10n": "3.14.20220511031550", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3",