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 #5386 from LLK/release/2021-05-12

Browse source 
[Develop] Release 2021-05-12
This commit is contained in:
chrisgarrity 2021-05-13 10:46:47 -04:00 committed by GitHub
commit fd6215d581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/forms/button.jsx
View file

@ -6,7 +6,7 @@ const React = require('react');
require('./button.scss');
const Button = props => {
const classes = classNames('button', props.className, {'close-button': props.isCloseType});
const classes = classNames('button', props.className, {'forms-close-button': props.isCloseType});
return (
<button

4
src/components/forms/button.scss
View file

@ -54,7 +54,7 @@ $pass-bg: $ui-aqua;
}
}
.close-button {
.forms-close-button {
padding: 0;
position: absolute;
@ -69,6 +69,6 @@ $pass-bg: $ui-aqua;
line-height: 2rem;
}
.close-button img {
.forms-close-button img {
padding-top: 0.5rem;
}

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

@ -364,7 +364,7 @@ const Developers = () => (
<a href="https://github.com/LLK/">GitHub</a>
),
contactUsLink: (
<a href="https://scratch.mit.edu/contact-us/">
<a href="/contact-us">
<FormattedMessage id="general.contactUs" />
</a>
)

2
src/views/developers/l10n.json
View file

@ -1,7 +1,7 @@
{
"developers.hereLinkText": "here",
"developers.title": "Scratch for Developers",
"developers.introLinkText": "Scratch Team at MIT",
"developers.introLinkText": "Scratch Team",
"developers.intro": "On this page, you’ll find information about open source projects created and maintained by the {introLink}, as well as our thoughts on best practices for designing learning experiences for children.",
"developers.projectsTitle": "Projects",
"developers.principlesTitle": "Principles",

9
src/views/splash/splash.jsx
View file

@ -165,6 +165,13 @@ class Splash extends React.Component {
shouldShowHOCMiddleBanner () {
return false; // we did not use this middle banner in last HoC
}
shouldShowIntro () {
return (
this.props.sessionStatus === sessionActions.Status.FETCHED && // done fetching session
Object.keys(this.props.user).length === 0 && // no user session found
this.shouldShowHOCTopBanner() !== true
);
}
shouldShowDonateBanner () {
return (
this.state.dismissedDonateBanner === false &&
@ -180,7 +187,7 @@ class Splash extends React.Component {
const showDonateBanner = this.shouldShowDonateBanner() || false;
const showHOCTopBanner = this.shouldShowHOCTopBanner() || false;
const showHOCMiddleBanner = this.shouldShowHOCMiddleBanner() || false;
const showIntro = showHOCTopBanner !== true;
const showIntro = this.shouldShowIntro() || false;
const showWelcome = this.shouldShowWelcome();
const homepageRefreshStatus = this.getHomepageRefreshStatus();