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

[Develop] Add project data to adventure game tutorial

package.json

@@ -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",

src/views/splash/hoc/hoc-banner.scss

@@ -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;

src/views/splash/hoc/middle-banner.jsx

@@ -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">

src/views/splash/hoc/top-banner.jsx

@@ -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">

src/views/splash/l10n.json

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

src/views/splash/presentation.jsx

@@ -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