diff --git a/src/components/extension-landing/extension-landing.scss b/src/components/extension-landing/extension-landing.scss
index 6d569f0d5..7d2f45d4f 100644
--- a/src/components/extension-landing/extension-landing.scss
+++ b/src/components/extension-landing/extension-landing.scss
@@ -7,6 +7,11 @@
padding: 0;
}
+html {
+ // Adjust target position to compensate for the floating top content
+ scroll-padding-top: calc(50px + 5rem); // nav bar + OS chooser
+}
+
.extension-landing {
&>div {
padding: 4rem 0;
diff --git a/src/components/extension-landing/extension-troubleshooting.jsx b/src/components/extension-landing/extension-troubleshooting.jsx
index 7ca3df87c..7e168f1fa 100644
--- a/src/components/extension-landing/extension-troubleshooting.jsx
+++ b/src/components/extension-landing/extension-troubleshooting.jsx
@@ -13,7 +13,7 @@ const ExtensionTroubleshooting = props => {
};
return (
diff --git a/src/components/extension-landing/install-scratch-link.jsx b/src/components/extension-landing/install-scratch-link.jsx
index 6f7f3a03f..9c6418b6a 100644
--- a/src/components/extension-landing/install-scratch-link.jsx
+++ b/src/components/extension-landing/install-scratch-link.jsx
@@ -12,8 +12,7 @@ require('./extension-landing.scss');
// Assumes this will only be called with an OS that needs Scratch Link
const InstallScratchLink = ({
currentOS,
- hideScratchLink,
- showEv3
+ hideScratchLink
}) => (
@@ -118,8 +121,7 @@ const InstallScratchLink = ({
InstallScratchLink.propTypes = {
currentOS: PropTypes.string.isRequired,
- hideScratchLink: PropTypes.bool,
- showEv3: PropTypes.bool
+ hideScratchLink: PropTypes.bool
};
module.exports = InstallScratchLink;
diff --git a/src/l10n.json b/src/l10n.json
index 004511f85..fb7ea7fb2 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -173,8 +173,8 @@
"installScratchLink.startScratchLink2.Windows": "If it does not appear, run Scratch Link from your Start menu.",
"installScratchLink.learnMore.bodyText": "To learn more about Scratch Link, click {linkText}.",
"installScratchLink.learnMore.linkText": "here",
- "installScratchLink.ev3Workaround": "If you have issues connecting EV3 with Scratch Link 2.0, please try Scratch Link 1.4.",
- "installScratchLink.downloadScratchLink1.4": "Direct download Scratch Link 1.4",
+ "installScratchLink.ifYouHaveTrouble.bodyText": "If you have trouble, see the {linkText} for tips.",
+ "installScratchLink.ifYouHaveTrouble.linkText": "Troubleshooting section",
"parents.FaqAgeRangeA": "While Scratch is primarily designed for 8 to 16 year olds, it is also used by people of all ages, including younger children with their parents.",
"parents.FaqAgeRangeQ": "What is the age range for Scratch?",
@@ -451,6 +451,8 @@
"extensions.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
"extensions.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
"extensions.checkOsVersionText2": "If you are using macOS 12, please update to macOS 12.3 or newer. Earlier versions of macOS 12 do not work correctly with Scratch Link.",
+ "extensions.ev3TryScratchLink1.4": "If you have issues connecting EV3 with Scratch Link 2.0, please try Scratch Link 1.4.",
+ "extensions.downloadScratchLink1.4": "Download Scratch Link 1.4",
"extensions.winOSVersionLinkText": "Windows",
"extensions.macOSVersionLinkText": "macOS",
"extensions.closeScratchCopiesTitle": "Close other copies of Scratch",
diff --git a/src/views/download/scratch-link/download.jsx b/src/views/download/scratch-link/download.jsx
index 94e7e4c0e..e85de5593 100644
--- a/src/views/download/scratch-link/download.jsx
+++ b/src/views/download/scratch-link/download.jsx
@@ -16,6 +16,7 @@ import ExtensionSection from '../../../components/extension-landing/extension-se
import ExtensionTroubleshooting from '../../../components/extension-landing/extension-troubleshooting.jsx';
import InstallScratchLink from '../../../components/extension-landing/install-scratch-link.jsx';
+import OS_ENUM from '../../../lib/os-enum.js';
import {isDownloaded} from '../../../components/install-scratch/install-util.js';
import '../../../components/extension-landing/extension-landing.scss';
@@ -135,6 +136,12 @@ const ScratchLink = ({intl}) => {
/>