Skip to content

GitLab

S
scratch-www
Unverified Commit 1ce8ef5b authored by picklesrus's avatar picklesrus Committed by GitHub
Browse files
Options

Merge pull request #2449 from picklesrus/download-directly-version 

New Download page
parents f9bf1228 c76d55de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 784 additions and 339 deletions
src/routes.json
View file @ 1ce8ef5b
......@@ -238,6 +238,13 @@
"view": "scratch_1.4/scratch_1.4",
"title": "Scratch 1.4"
},
{
"name": "scratch2",
"pattern": "^/download/scratch2/?$",
"routeAlias": "/download/scratch2",
"view": "download/scratch2/download",
"title": "Scratch 2.0"
},
{
"name": "search",
"pattern": "^/search/:projects/?$",
......
src/views/download/download.jsx
View file @ 1ce8ef5b
This diff is collapsed.
src/views/download/download.scss
View file @ 1ce8ef5b
......@@ -6,123 +6,168 @@
}
.download {
.title-banner {
&.masthead {
margin-bottom: 0;
background-color: $ui-blue-dark;
padding-bottom: 0;
.title {
margin-bottom: 1rem;
font-size: 2rem;
}
h1 {
margin: 0 0 2rem 0;
text-align: left;
color: $ui-white;
}
.legacy-link {
display: flex;
}
.download-button {
display: inline-block;
margin: .5em 0;
border: 0;
border-radius: 8px;
background-color: $ui-blue;
cursor: pointer;
padding: 1rem;
color: $ui-white;
font-size: 1rem;
}
.download-header {
background-color: $ui-blue;
padding: 4rem 0;
color: $ui-white;
.title {
color: $ui-white;
}
.inner {
justify-content: space-between;
flex-wrap: nowrap;
}
p {
margin: 0;
text-align: left;
color: $ui-white;
.download-info {
padding-right: $cols1;
max-width: $cols6 + ($gutter / $em);
align-items: flex-start;
a {
border-bottom: 1px solid $ui-white;
.download-copy {
margin-bottom: 5rem;
align-items: flex-start;
.download-title {
display: flex;
margin-bottom: 2rem;
color: $ui-white;
font-size: 2rem;
}
}
.band {
margin-top: 2rem;
background-color: $ui-white-15percent;
padding: 1rem 0;
.icon {
padding-right: .5rem;
max-height: 100%;
align-self: center;
}
.download-description {
line-height: 1.7rem;
font-size: 1.2rem;
}
}
.sub-nav {
text-align: left;
justify-content: flex-start;
.download-requirements-container {
font-weight: 500;
align-items: flex-start;
li {
margin: 0 .5rem 0 0;
.requirements-header {
margin-bottom: 1.5rem;
}
.download-requirements {
justify-content: space-between;
}
.download-requirements span {
display: flex;
margin-right: 1rem;
font-size: 15px;
align-items: center;
}
.download-requirements span img {
padding-right: .5rem;
}
}
}
}
.sub-nav-item {
margin: .5rem;
}
.callout {
text-align: center;
}
.download-content {
padding-bottom: 2rem;
}
.download-image {
width: 100%;
max-width: $cols6;
.three-col-row {
align-items: flex-start;
img {
max-width: 100%;
max-height: 100%;
}
}
}
.installation {
background-color: $ui-gray;
padding: 2rem;
}
.install-scratch {
padding: 2rem 0;
.installation-column {
max-width: $cols4;
text-align: center;
.inner {
align-items: flex-start;
}
p {
margin-right: .5rem;
margin-left: .5rem;
.downloads-container {
text-align: center;
}
}
.installation-column-number {
margin: 2rem auto;
border: 2px solid $active-gray;
border-radius: 2rem;
background-color: $ui-blue;
width: 3.75rem;
height: 3.75rem;
.store-badge {
display: block;
width: 150px;
height: 80px;
}
}
.installation-column-number-text {
text-align: center;
line-height: 1.8em;
color: $type-white;
}
.download-section {
padding: 4rem 0;
.installation-downloads {
padding-left: 0;
list-style: none;
.inner {
align-items: flex-start;
}
}
.installation-downloads-item {
margin: .25rem;
padding: 0;
text-align: center;
.blue {
background-color: $ui-blue-10percent;
}
section {
margin-bottom: 2rem;
}
.faq {
p {
margin-bottom: 1.25rem;
margin-left: 0;
max-width: $cols8;
text-align: left;
}
.mod-link {
color: $ui-white;
}
@media #{$small} {
.inner {
.installation-column {
max-width: 100%;
}
.faq-question {
margin-bottom: 0;
font-size: 1.4rem;
}
}
@media #{$intermediate-and-smaller} {
.three-col-row {
flex-direction: column;
align-items: center;
.older-version {
padding-right: 24px;
p {
line-height: normal;
color: $link-blue;
font-weight: 600;
}
.little-arrow {
padding-left: 2px;
}
.screenshot {
margin-top: 1rem;
$img-border: rgba(0, 0, 0, .05);
border: 2px solid $img-border;
border-radius: 8px;
}
}
}
src/views/download/l10n.json
View file @ 1ce8ef5b
{
"download.title": "Scratch 2.0 Offline Editor",
"download.intro": "You can install the Scratch 2.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
"download.introMac": "<b>Note for Mac Users:</b> the latest version of Scratch 2.0 Offline requires Adobe AIR 20. To upgrade to Adobe AIR 20 manually, go <a href=\"https://get.adobe.com/air/\">here</a>.",
"download.installation": "Installation",
"download.airTitle": "Adobe AIR",
"download.airBody": "If you don't already have it, download and install the latest <a href=\"http://get.adobe.com/air/\">Adobe AIR</a>",
"download.macOSX": "Mac OS X",
"download.macOlder": "Mac OS 10.5 & Older",
"download.windows": "Windows",
"download.download": "Download",
"download.offlineEditorTitle": "Scratch Offline Editor",
"download.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor",
"download.supportMaterialsTitle": "Support Materials",
"download.supportMaterialsBody": "Need some help getting started? Here are some helpful resources.",
"download.starterProjects": "Starter Projects",
"download.gettingStarted": "Getting Started Guide",
"download.scratchCards": "Scratch Cards",
"download.updatesTitle": "Updates",
"download.updatesBody": "The Offline Editor can update itself (with user permission). It will check for updates at startup or you can use the \"Check for updates\" command in the file menu.",
"download.currentVersion": "The current version is {version}.",
"download.otherVersionsTitle": "Other Versions of Scratch",
"download.otherVersionsOlder": "If you have an older computer, or cannot install the Scratch 2.0 offline editor, you can try installing <a href=\"http://scratch.mit.edu/scratch_1.4/\">Scratch 1.4</a>.",
"download.otherVersionsAdmin": "If you are a network administrator: a Scratch 2.0 MSI has been created and maintained by a member of the community and hosted for public download <a href=\"http://llk.github.io/scratch-msi/\">here</a>.",
"download.knownIssuesTitle": "Known issues",
"download.knownIssuesOne": "If your offline editor is crashing directly after Scratch is opened, install the Scratch 2 offline editor again (see step 2 above). This issue is due to a bug introduced in Adobe AIR version 14 (released April 2014).",
"download.knownIssuesTwo": "Graphic effects blocks (in \"Looks\") may slow down projects due to a known Flash bug.",
"download.knownIssuesThree": "The <b>backpack</b> is not yet available.",
"download.knownIssuesFour": "On Mac OS you may see a prompt indicating that \"Scratch 2 is trying to install a new helper tool\" and asking for your user name and password. We are currently investigating a solution to this problem.",
"download.reportBugs": "Report Bugs and Glitches",
"download.notAvailable": "Hmm, editor downloads are not available right now - please refresh the page to try again."
"download.title": "Scratch 3.0 Desktop",
"download.intro": "You can install the Scratch 3.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
"download.requirements": "Requirements",
"download.imgAltDownloadIllustration" : "Scratch 3.0 Desktop screenshot",
"download.installHeaderTitle": "Install Scratch Desktop",
"download.downloadAndInstall": "Download and install Scratch Desktop",
"download.troubleshootingTitle": "FAQ",
"download.startScratchDesktop": "Start Scratch Desktop",
"download.howDoIInstall": "How do I install Scratch Desktop?",
"download.whenSupportLinux": "When will you have Scratch Desktop for Linux?",
"download.supportLinuxAnswer" : "Scratch Desktop on Linux is currently not supported. We are working with partners and the open-source community to determine if there is a way we can support Linux in the future. Stay tuned!",
"download.supportChromeOS" : "When will you have Scratch Desktop for ChromeOS?",
"download.supportChromeOSAnswer": "Scratch Desktop for ChromeOS is not yet available. We are working on it and expect to release later in 2019.",
"download.olderVersionsTitle" : "Older Versions",
"download.olderVersions": "Looking for an older version of Scratch Desktop?",
"download.scratch1-4Desktop" : "Scratch 1.4 Desktop",
"download.scratch2Desktop" : "Scratch 2.0 Desktop",
"download.cannotAccessMacStore" : "What if I can't access the Mac App Store?",
"download.cannotAccessWindowsStore" : "What if I can't access the Microsoft Store?",
"download.appstoreAccessAnswer" : "You can download Scratch Desktop directly to your computer by {directDownloadLink}.",
"download.directDownloadText" : "clicking here",
"download.macMoveToApplications" : "Move Scratch Desktop to your Applications folder and start Scratch Desktop.",
"download.winMoveToApplications" : "Run it."
}
src/views/download/scratch2/download.jsx 0 → 100644
View file @ 1ce8ef5b
This diff is collapsed.
src/views/download/scratch2/download.scss 0 → 100644
View file @ 1ce8ef5b
@import "../../../colors";
@import "../../../frameless";
#view {
padding: 0;
}
.download {
.title-banner {
&.masthead {
margin-bottom: 0;
background-color: $ui-blue-dark;
padding-bottom: 0;
h1 {
margin: 0 0 2rem 0;
text-align: left;
color: $ui-white;
}
p {
margin: 0;
text-align: left;
color: $ui-white;
a {
border-bottom: 1px solid $ui-white;
color: $ui-white;
}
}
.band {
margin-top: 2rem;
background-color: $ui-white-15percent;
padding: 1rem 0;
}
.sub-nav {
text-align: left;
justify-content: flex-start;
li {
margin: 0 .5rem 0 0;
}
}
}
}
.sub-nav-item {
margin: .5rem;
}
.callout {
text-align: center;
}
.download-content {
padding-bottom: 2rem;
}
.three-col-row {
align-items: flex-start;
}
.installation {
background-color: $ui-gray;
padding: 2rem;
}
.installation-column {
max-width: $cols4;
text-align: center;
p {
margin-right: .5rem;
margin-left: .5rem;
}
}
.installation-column-number {
margin: 2rem auto;
border: 2px solid $active-gray;
border-radius: 2rem;
background-color: $ui-blue;
width: 3.75rem;
height: 3.75rem;
}
.installation-column-number-text {
text-align: center;
line-height: 1.8em;
color: $type-white;
}
.installation-downloads {
padding-left: 0;
list-style: none;
}
.installation-downloads-item {
margin: .25rem;
padding: 0;
text-align: center;
}
section {
margin-bottom: 2rem;
}
.mod-link {
color: $ui-white;
}
@media #{$small} {
.inner {
.installation-column {
max-width: 100%;
}
}
}
@media #{$intermediate-and-smaller} {
.three-col-row {
flex-direction: column;
align-items: center;
}
}
}
src/views/download/scratch2/l10n.json 0 → 100644
View file @ 1ce8ef5b
{
"download.title": "Scratch 2.0 Offline Editor",
"download.intro": "You can install the Scratch 2.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
"download.introMac": "<b>Note for Mac Users:</b> the latest version of Scratch 2.0 Offline requires Adobe AIR 20. To upgrade to Adobe AIR 20 manually, go <a href=\"https://get.adobe.com/air/\">here</a>.",
"download.installation": "Installation",
"download.airTitle": "Adobe AIR",
"download.airBody": "If you don't already have it, download and install the latest <a href=\"http://get.adobe.com/air/\">Adobe AIR</a>",
"download.macOSX": "Mac OS X",
"download.macOlder": "Mac OS 10.5 & Older",
"download.windows": "Windows",
"download.download": "Download",
"download.offlineEditorTitle": "Scratch Offline Editor",
"download.offlineEditorBody": "Next download and install the Scratch 2.0 Offline Editor",
"download.supportMaterialsTitle": "Support Materials",
"download.supportMaterialsBody": "Need some help getting started? Here are some helpful resources.",
"download.starterProjects": "Starter Projects",
"download.gettingStarted": "Getting Started Guide",
"download.scratchCards": "Scratch Cards",
"download.updatesTitle": "Updates",
"download.updatesBody": "The Offline Editor can update itself (with user permission). It will check for updates at startup or you can use the \"Check for updates\" command in the file menu.",
"download.currentVersion": "The current version is {version}.",
"download.otherVersionsTitle": "Other Versions of Scratch",
"download.otherVersionsOlder": "If you have an older computer, or cannot install the Scratch 2.0 offline editor, you can try installing <a href=\"http://scratch.mit.edu/scratch_1.4/\">Scratch 1.4</a>.",
"download.otherVersionsAdmin": "If you are a network administrator: a Scratch 2.0 MSI has been created and maintained by a member of the community and hosted for public download <a href=\"http://llk.github.io/scratch-msi/\">here</a>.",
"download.knownIssuesTitle": "Known issues",
"download.knownIssuesOne": "If your offline editor is crashing directly after Scratch is opened, install the Scratch 2 offline editor again (see step 2 above). This issue is due to a bug introduced in Adobe AIR version 14 (released April 2014).",
"download.knownIssuesTwo": "Graphic effects blocks (in \"Looks\") may slow down projects due to a known Flash bug.",
"download.knownIssuesThree": "The <b>backpack</b> is not yet available.",
"download.knownIssuesFour": "On Mac OS you may see a prompt indicating that \"Scratch 2 is trying to install a new helper tool\" and asking for your user name and password. We are currently investigating a solution to this problem.",
"download.reportBugs": "Report Bugs and Glitches",
"download.notAvailable": "Hmm, editor downloads are not available right now - please refresh the page to try again."
}
static/svgs/download/r-arrow.svg 0 → 100644
View file @ 1ce8ef5b
<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M10.158 16.994c-.311 0-.602-.119-.818-.333L5 12.319a1.182 1.182 0 0 1-.24-1.287c.186-.43.595-.695 1.07-.695h1.646l.84-6.042a1.887 1.887 0 0 1 2.118-1.614c.854.134 1.514.8 1.617 1.62l.862 6.036h1.575c.48 0 .907.282 1.088.717.18.439.083.924-.259 1.265l-4.341 4.342a1.151 1.151 0 0 1-.817.333" id="a"/></defs><use fill="#4C97FF" transform="rotate(-90 10.164 9.83)" xlink:href="#a" fill-rule="evenodd"/></svg>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment