scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6161 from LLK/release/2021-10-13

Browse source 
[Master] release/2021-10-13
This commit is contained in:
Karishma Chadha 2021-10-15 09:27:27 -04:00 committed by GitHub
commit 7d4fdc2af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 101 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
package-lock.json generated
View file

@ -225,20 +225,20 @@
"dev": true
},
"@babel/core": {
"version": "7.15.5",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
"integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
"integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.14.5",
"@babel/generator": "^7.15.4",
"@babel/code-frame": "^7.15.8",
"@babel/generator": "^7.15.8",
"@babel/helper-compilation-targets": "^7.15.4",
"@babel/helper-module-transforms": "^7.15.4",
"@babel/helper-module-transforms": "^7.15.8",
"@babel/helpers": "^7.15.4",
"@babel/parser": "^7.15.5",
"@babel/parser": "^7.15.8",
"@babel/template": "^7.15.4",
"@babel/traverse": "^7.15.4",
"@babel/types": "^7.15.4",
"@babel/types": "^7.15.6",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@ -248,21 +248,21 @@
},
"dependencies": {
"@babel/code-frame": {
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
"integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
"dev": true,
"requires": {
"@babel/highlight": "^7.14.5"
}
},
"@babel/generator": {
"version": "7.15.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
"integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
"dev": true,
"requires": {
"@babel/types": "^7.15.4",
"@babel/types": "^7.15.6",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@ -308,9 +308,9 @@
}
},
"@babel/parser": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz",
"integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
"dev": true
},
"@babel/template": {
@ -503,16 +503,10 @@
"picocolors": "^0.2.1"
}
},
"caniuse-lite": {
"version": "1.0.30001264",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz",
"integrity": "sha512-Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA==",
"dev": true
},
"electron-to-chromium": {
"version": "1.3.860",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.860.tgz",
"integrity": "sha512-gWwGZ+Wv4Mou2SJRH6JQzhTPjL5f95SX7n6VkLTQ/Q/INsZLZNQ1vH2GlZjozKyvT0kkFuCmWTwIoCj+/hUDPw==",
"version": "1.3.867",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz",
"integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==",
"dev": true
},
"semver": {
@ -625,9 +619,9 @@
}
},
"@babel/helper-module-transforms": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz",
"integrity": "sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
"integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
"dev": true,
"requires": {
"@babel/helper-module-imports": "^7.15.4",
@ -641,21 +635,21 @@
},
"dependencies": {
"@babel/code-frame": {
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
"integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
"dev": true,
"requires": {
"@babel/highlight": "^7.14.5"
}
},
"@babel/generator": {
"version": "7.15.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
"integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
"dev": true,
"requires": {
"@babel/types": "^7.15.4",
"@babel/types": "^7.15.6",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@ -701,9 +695,9 @@
}
},
"@babel/parser": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz",
"integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
"dev": true
},
"@babel/template": {
@ -860,21 +854,21 @@
},
"dependencies": {
"@babel/code-frame": {
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
"integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
"dev": true,
"requires": {
"@babel/highlight": "^7.14.5"
}
},
"@babel/generator": {
"version": "7.15.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
"integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
"dev": true,
"requires": {
"@babel/types": "^7.15.4",
"@babel/types": "^7.15.6",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@ -920,9 +914,9 @@
}
},
"@babel/parser": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz",
"integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
"dev": true
},
"@babel/template": {
@ -1093,21 +1087,21 @@
},
"dependencies": {
"@babel/code-frame": {
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
"integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
"integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
"dev": true,
"requires": {
"@babel/highlight": "^7.14.5"
}
},
"@babel/generator": {
"version": "7.15.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
"integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
"integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
"dev": true,
"requires": {
"@babel/types": "^7.15.4",
"@babel/types": "^7.15.6",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@ -1153,9 +1147,9 @@
}
},
"@babel/parser": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz",
"integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==",
"version": "7.15.8",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
"integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
"dev": true
},
"@babel/template": {
@ -20514,21 +20508,21 @@
}
},
"scratch-blocks": {
"version": "0.1.0-prerelease.20211006052142",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211006052142.tgz",
"integrity": "sha512-g7MIUkppbumntDSuAKQNJ2HUA4GYhmYK5e2p6iPULkOPuHktWOxZ/oZ3zuvpgyE+nTXjRz492dqSPycrireUIw==",
"version": "0.1.0-prerelease.20211013085421",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211013085421.tgz",
"integrity": "sha512-OOa5CgD7ZZ8zFqVUOhiSep4xtRLgswl6mZUqWPVO2BT4SbJH19xlu91xCBpbHm5ozrmA6XMzMJcmX/TO57Ye6A==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
"google-closure-library": "20190301.0.0",
"imports-loader": "0.6.5",
"scratch-l10n": "3.14.20211006031531"
"scratch-l10n": "3.14.20211013031511"
}
},
"scratch-gui": {
"version": "0.1.0-prerelease.20211006090606",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211006090606.tgz",
"integrity": "sha512-k5nVHArbf+H+1GmwU27JdVxBKEsLtMuXgz5NXDazbH8SxcbdXPXNOBecbq2E8La2nXA3aODI/88VFonSe1oyMg==",
"version": "0.1.0-prerelease.20211013110407",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211013110407.tgz",
"integrity": "sha512-2M8qawOyb7fzd16cjeJQUgR70BriUnArRa77TvVADRqpxDDimXs6R7/QA9IwZLNeomrCMHOYZ18gXAI4T9vnsw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@ -20579,14 +20573,14 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20211006052142",
"scratch-l10n": "3.14.20211006031531",
"scratch-paint": "0.2.0-prerelease.20211006071611",
"scratch-blocks": "0.1.0-prerelease.20211013085421",
"scratch-l10n": "3.14.20211013031511",
"scratch-paint": "0.2.0-prerelease.20211013052452",
"scratch-render": "0.1.0-prerelease.20210819221425",
"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.20211006040717",
"scratch-vm": "0.2.0-prerelease.20211011184543",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
"text-encoding": "0.7.0",
@ -20729,9 +20723,9 @@
"dev": true
},
"electron-to-chromium": {
"version": "1.3.860",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.860.tgz",
"integrity": "sha512-gWwGZ+Wv4Mou2SJRH6JQzhTPjL5f95SX7n6VkLTQ/Q/INsZLZNQ1vH2GlZjozKyvT0kkFuCmWTwIoCj+/hUDPw==",
"version": "1.3.867",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz",
"integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==",
"dev": true
},
"has-flag": {
@ -20994,9 +20988,9 @@
}
},
"scratch-l10n": {
"version": "3.14.20211006031531",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz",
"integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==",
"version": "3.14.20211013031511",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211013031511.tgz",
"integrity": "sha512-AeAIz+u7lblZMis8xwA4kxJoRmG4UIjRwRaRaApoicGpbUjap2WFpylSy7ebIDn6CBo8TKNH6mRY9Mmgzp23Kw==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
@ -21006,9 +21000,9 @@
}
},
"scratch-paint": {
"version": "0.2.0-prerelease.20211006071611",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211006071611.tgz",
"integrity": "sha512-5hJTHgiUCOdzhUqgydQwVkpLr/KY1ow0i5Em7UTuCI98qUo1pFIKkSaR9ygEpEeHeC3anmxfmuUIpGRVJ4aHnA==",
"version": "0.2.0-prerelease.20211013052452",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211013052452.tgz",
"integrity": "sha512-pyKwXuxcxmS9WoHIoiE3CkifZVapIpUOiQmbcM5XV/BS6GqJ8CKwknUFRrO5pM5UUhGU8ksGSnJEtoI80MYqkA==",
"dev": true,
"requires": {
"@scratch/paper": "0.11.20200728195508",
@ -21225,9 +21219,9 @@
"dev": true
},
"scratch-vm": {
"version": "0.2.0-prerelease.20211006040717",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211006040717.tgz",
"integrity": "sha512-L8JzHKZsWk6DOiJ9HkpHHwtdZJQ2ZFtB41c6rBqPhPpRgOviBo9Wt8P2U662ZztJq2JrZPbesdmemqMf5Jkt5A==",
"version": "0.2.0-prerelease.20211011184543",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011184543.tgz",
"integrity": "sha512-4t/uIQt35HGL52U5gp9/DXALycvo1KkFmsAOyOy4hahrI6xLOGA5M27zOZDh4c9GX8EGPV51xzTqLstd/Fh3Wg==",
"dev": true,
"requires": {
"@vernier/godirect": "1.5.0",

4
package.json
View file

@ -130,8 +130,8 @@
"redux-mock-store": "1.5.4",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20211006090606",
"scratch-l10n": "3.14.20211006031531",
"scratch-gui": "0.1.0-prerelease.20211013110407",
"scratch-l10n": "3.14.20211013031511",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
"style-loader": "0.12.3",

2
src/components/footer/www/footer.jsx
View file

@ -138,7 +138,7 @@ const Footer = props => (
</a>
</dd>
<dd>
<a href="/info/faq">
<a href="/faq">
<FormattedMessage id="general.faq" />
</a>
</dd>

12
src/routes.json
View file

@ -151,8 +151,8 @@
},
{
"name": "faq",
"pattern": "^/info/faq/?(\\?.*)?$",
"routeAlias": "/info/(cards|credits|faq)/?$",
"pattern": "^/faq/?(\\?.*)?$",
"routeAlias": "/faq",
"view": "faq/faq",
"title": "FAQ"
},
@ -376,7 +376,7 @@
"name":"3-faq-redirect",
"pattern": "^/3faq/?$",
"routeAlias": "/3faq/?$",
"redirect": "info/faq#scratch3"
"redirect": "/faq#scratch3"
},
{
"name" : "credits-redirect",
@ -384,6 +384,12 @@
"routeAlias": "/info/(cards|credits|faq|donate)/?$",
"redirect" : "/credits"
},
{
"name" : "faq-redirect",
"pattern": "^/info/faq/?$",
"routeAlias": "/info/(cards|credits|faq|donate)/?$",
"redirect" : "/faq"
},
{
"name": "donate-redirect",
"pattern": "^/info/donate/?",

2
src/views/about/about.jsx
View file

@ -175,7 +175,7 @@ const About = () => (
<a href="/ideas"><FormattedMessage id="about.learnMoreHelp" /></a>
</li>
<li>
<a href="/info/faq"><FormattedMessage id="about.learnMoreFaq" /></a>
<a href="/faq"><FormattedMessage id="about.learnMoreFaq" /></a>
</li>
<li>
<a href="/parents"><FormattedMessage id="about.learnMoreParents" /></a>

4
src/views/contact-us/contact-us.jsx
View file

@ -57,7 +57,7 @@ class ContactUs extends React.Component {
<p><FormattedMessage
id="contactUs.faqInfo"
values={{faqLink: (
<a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
<a href="/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
)}}
/></p>
<h3>
@ -115,7 +115,7 @@ class ContactUs extends React.Component {
<nav>
<ol>
<li className="nav-header"><FormattedMessage id="contactUs.findHelp" /></li>
<li><a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a></li>
<li><a href="/faq"><FormattedMessage id="contactUs.faqLinkText" /></a></li>
</ol>
</nav>
{this.state.showForm && (

2
src/views/parents/parents.jsx
View file

@ -114,7 +114,7 @@ const Landing = () => (
id="parents.faqMoreAndAsk"
values={{
faqPage: (
<a href="/info/faq">
<a href="/faq">
<FormattedMessage
id="parents.faqLinkText"
/>

4
src/views/preview/comment/comment.scss
View file

@ -1,8 +1,8 @@
@import "../../../colors";
.compose-row {
.compose-row, .compose-disabled {
margin-top: 30px;
margin-bottom: 40px;
margin-bottom: 32px;
}
.compose-comment {

2
src/views/preview/unsupported-browser.jsx
View file

@ -35,7 +35,7 @@ const UnsupportedBrowser = () => (
faqLink: (
<a
className="faq-link"
href="/info/faq"
href="/faq"
>
<FormattedMessage id="general.faq" />
</a>

2
src/views/splash/presentation.jsx
View file

@ -389,7 +389,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
>
Confirm your email
</a>{' '}to enable sharing.{' '}
<a href="/info/faq/#accounts">
<a href="/faq/#accounts">
Having trouble?
</a>
</DropdownBanner>,

3
src/views/studio/studio.scss
View file

@ -204,6 +204,7 @@ $radius: 8px;
img {
margin-right: 0.5em;
width: 1.5em;
height: 1.5em;
filter: invert(0.55);
}
.tab-count {
@ -654,4 +655,4 @@ $radius: 8px;
.studio-curator-mute-box {
margin: 20px 0;
}
}

2
src/views/terms/terms.jsx
View file

@ -265,7 +265,7 @@ const Terms = () => (
</p>
<p>
5.3 The source code for Scratch 1.4 is available for download and subject
to the copyright notice as indicated on the <a href="/info/faq">Scratch FAQ</a>
to the copyright notice as indicated on the <a href="/faq">Scratch FAQ</a>
{' '}page.
</p>
<p>

2
test/integration/footer-links.test.js
View file

@ -95,7 +95,7 @@ describe('www-integration footer links', () => {
await clickText('FAQ');
let url = await driver.getCurrentUrl();
let pathname = (new URL(url)).pathname;
expect(pathname).toMatch(/^\/info\/faq\/?$/);
expect(pathname).toMatch(/^\/faq\/?$/);
});
test('click Download link', async () => {