From 7030b16e2808e70bbab24e08e00cd3f387621542 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Tue, 8 Jan 2019 16:04:44 +0900
Subject: [PATCH 1/4] New about page video CSS

---
 src/views/about/about.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/about/about.scss b/src/views/about/about.scss
index 12e84bb6a..3a449de93 100644
--- a/src/views/about/about.scss
+++ b/src/views/about/about.scss
@@ -32,10 +32,16 @@
             iframe {
                 display: block;
                 border: 1px solid $ui-gray;
-                width: 100%;
                 height: 290px;
             }
         }
+
+        div.video-container,
+        div.about-scratch-video {
+            height: 290px;
+            width: 400px;
+            min-width: 400px;
+        }
     }
 
     .body {

From 1695bf23b8fa0fb9a77fe40a1f10fe793d8a65a0 Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Tue, 8 Jan 2019 16:05:53 +0900
Subject: [PATCH 2/4] New about page video

---
 src/views/about/about.jsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx
index d557c1869..5e4b9a4a5 100644
--- a/src/views/about/about.jsx
+++ b/src/views/about/about.jsx
@@ -3,6 +3,7 @@ const FormattedMessage = require('react-intl').FormattedMessage;
 const render = require('../../lib/render.jsx');
 
 const Page = require('../../components/page/www/page.jsx');
+const Video = require('../../components/video/video.jsx');
 
 require('./about.scss');
 
@@ -22,14 +23,12 @@ const About = () => (
                 </ul>
             </div>
 
-            <div>
-                <iframe
-                    allowFullScreen
-                    frameBorder="0"
-                    mozallowfullscreen={'true'}
-                    src="https://player.vimeo.com/video/65583694?title=0&byline=0&portrait=0"
-                    title="Scratch Overview Video"
-                    webkitallowfullscreen={'true'}
+            <div className="video-container">
+                <Video
+                    className="about-scratch-video"
+                    height="290"
+                    videoId="joal01i8b1"
+                    width="400"
                 />
             </div>
         </div>
@@ -141,7 +140,7 @@ const About = () => (
                     <h3><FormattedMessage id="about.learnMore" /></h3>
                     <ul className="list">
                         <li>
-                            <a href="/tips"><FormattedMessage id="about.learnMoreHelp" /></a>
+                            <a href="/ideas"><FormattedMessage id="about.learnMoreHelp" /></a>
                         </li>
                         <li>
                             <a href="/info/faq"><FormattedMessage id="about.learnMoreFaq" /></a>
@@ -150,7 +149,7 @@ const About = () => (
                             <a href="/parents"><FormattedMessage id="about.learnMoreParents" /></a>
                         </li>
                         <li>
-                            <a href="/info/credits"><FormattedMessage id="about.learnMoreCredits" /></a>
+                            <a href="/credits"><FormattedMessage id="about.learnMoreCredits" /></a>
                         </li>
                     </ul>
                 </li>
@@ -162,7 +161,7 @@ const About = () => (
                         values={{
                             supportersList: 'National Science Foundation, Scratch Foundation, Siegel Family Endowment, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, MacArthur Foundation', // eslint-disable-line max-len
                             creditsLink: (
-                                <a href="//scratch.mit.edu/info/credits">
+                                <a href="/credits">
                                     <FormattedMessage id="about.creditsLinkText" />
                                 </a>
                             ),

From 10da7662e62b879c5f272c7f0fa5222503ee88bc Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Wed, 30 Jan 2019 19:54:17 +0900
Subject: [PATCH 3/4] Remove height and width

---
 src/views/about/about.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx
index 5e4b9a4a5..5a6b7b463 100644
--- a/src/views/about/about.jsx
+++ b/src/views/about/about.jsx
@@ -26,9 +26,7 @@ const About = () => (
             <div className="video-container">
                 <Video
                     className="about-scratch-video"
-                    height="290"
                     videoId="joal01i8b1"
-                    width="400"
                 />
             </div>
         </div>

From 42d5254f1e3822838885a3ce334ddf0d1044a692 Mon Sep 17 00:00:00 2001
From: chrisgarrity <chrisg@media.mit.edu>
Date: Wed, 30 Jan 2019 12:58:15 +0100
Subject: [PATCH 4/4] more resizing for new video

---
 src/views/about/about.scss | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/views/about/about.scss b/src/views/about/about.scss
index 3a449de93..a2fee0787 100644
--- a/src/views/about/about.scss
+++ b/src/views/about/about.scss
@@ -28,17 +28,11 @@
                     padding-right: 10px;
                 }
             }
-
-            iframe {
-                display: block;
-                border: 1px solid $ui-gray;
-                height: 290px;
-            }
         }
 
         div.video-container,
         div.about-scratch-video {
-            height: 290px;
+            height: 225px;
             width: 400px;
             min-width: 400px;
         }