scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2376 from LLK/hotfix/fix-adventure-game

Browse source 
[Develop] Add project data to adventure game tutorial
This commit is contained in:
Ray Schamp 2018-12-03 13:28:46 -05:00 committed by GitHub
commit 80cf7137b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -102,7 +102,7 @@
"redux-thunk": "2.0.1",
"sass-lint": "1.5.1",
"sass-loader": "6.0.6",
"scratch-gui": "develop",
"scratch-gui": "latest",
"scratchr2_translations": "git://github.com/LLK/scratchr2_translations.git#master",
"slick-carousel": "1.6.0",
"source-map-support": "0.3.2",

2
src/views/splash/hoc/hoc-banner.scss
View file

@ -75,7 +75,7 @@ $tile-height: 244px;
.hoc-more-activities {
border-radius: 10px;
background-color: $ui-white;
padding: .5rem 1rem;
padding: .5rem 1rem .75rem 1rem;
color: $ui-blue;
font-size: .75rem;
font-weight: bold;

6
src/views/splash/hoc/middle-banner.jsx
View file

@ -25,7 +25,7 @@ const MiddleBanner = () => (
</a>
</FlexRow>
<FlexRow className="hoc-banner-images">
<a href="http://localhost:8333/projects/editor/?tip_bar=name">
<a href="/projects/editor/?tip_bar=name">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/animate-your-name.jpg" />
<div className="hoc-image-text">
@ -33,7 +33,7 @@ const MiddleBanner = () => (
</div>
</FlexRow>
</a>
<a href="http://localhost:8333/projects/editor/?tip_bar=fly">
<a href="/projects/editor/?tip_bar=fly">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/make-it-fly.jpg" />
<div className="hoc-image-text">
@ -45,7 +45,7 @@ const MiddleBanner = () => (
key="frameless-desktop"
minWidth={frameless.desktop}
>
<a href="http://localhost:8333/projects/editor/?tip_bar=pong">
<a href="/projects/editor/?tip_bar=pong">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/pong-game.jpg" />
<div className="hoc-image-text">

2
src/views/splash/hoc/top-banner.jsx
View file

@ -47,7 +47,7 @@ const TopBanner = () => (
</div>
</FlexRow>
</a>
<a href="https://beta.scratch.mit.edu/?tutorial=animate-an-adventure-game">
<a href="https://beta.scratch.mit.edu/?tutorial=animate-an-adventure-game#249143200">
<FlexRow className="hoc-banner-image column">
<img src="/images/hoc/create-an-adventure-game.jpg" />
<div className="hoc-image-text">

1
src/views/splash/l10n.json
View file

@ -53,5 +53,4 @@
"hocbanner.name": "Animate a Name",
"hocbanner.fly": "Make it Fly",
"hocbanner.pong": "Pong Game"
}

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

@ -492,7 +492,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
minWidth={frameless.desktop}
>
{
(Date.now() < HOC_START_TIME && // Hide intro if HoC banner is showing
(Date.now() < HOC_START_TIME || // Hide intro if HoC banner is showing
Date.now() > HOC_END_TIME) ?
[
<Intro