Merge pull request #566 from rschamp/hotfix/remove-banner

[Master] Remove Make it Fly banner

src/components/cn-banner/cn-banner.jsx

@@ -1,53 +0,0 @@
-var classNames = require('classnames');
-var FormattedMessage = require('react-intl').FormattedMessage;
-var React = require('react');
-
-var TitleBanner = require('../title-banner/title-banner.jsx');
-var Button = require('../forms/button.jsx');
-var FlexRow = require('../flex-row/flex-row.jsx');
-
-require('./cn-banner.scss');
-
-/**
- * Homepage banner for Cartoon Network collaboration
- */
-var CNBanner = React.createClass({
-    type: 'CNBanner',
-    render: function () {
-        var classes = classNames(
-            'cn-banner',
-            this.props.className
-        );
-        return (
-            <TitleBanner className={classes}>
-                <FlexRow className="inner">
-                    <div className="cta">
-                        <h1>
-                            <FormattedMessage id='cnbanner.makeItFly' />
-                        </h1>
-                        <p>
-                            <FormattedMessage id='cnbanner.flyDescription' />
-                        </p>
-                        <div className="button-row">
-                            <a href="/studios/2050750/">
-                                <Button>
-                                    <FormattedMessage id='cnbanner.seeExamples' />
-                                </Button>
-                            </a>
-                            <a href="/fly/">
-                                <Button>
-                                    <FormattedMessage id='cnbanner.makeYourOwn' />
-                                </Button>
-                            </a>
-                        </div>
-                    </div>
-                    <div className="flying">
-                        <img src="/svgs/make-it-fly-graphic.svg" alt="" />
-                    </div>
-                </FlexRow>
-            </TitleBanner>
-        );
-    }
-});
-
-module.exports = CNBanner;

src/components/cn-banner/cn-banner.scss

@@ -1,69 +0,0 @@
-@import "../../colors";
-@import "../../frameless";
-
-.cn-banner {
-    background-color: $ui-blue;
-    background-image: url("/images/ppg-bg.jpg");
-
-    &.title-banner {
-        transition: none;
-        margin-bottom: 20px;
-        padding: 0;
-        text-align: left;
-
-        h1,
-        p {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            text-align: left;
-        }
-    }
-
-    h1 {
-        font-weight: 500;
-    }
-
-    p {
-        font-weight: 300;
-    }
-
-    .cta,
-    .flying {
-        display: flex;
-        height: 235px;
-        justify-content: center;
-    }
-
-    .cta {
-        margin-right: $cols1;
-        width: $cols5;
-        flex-direction: column;
-    }
-
-    .flying {
-        margin: 0 $cols1;
-        width: $cols4;
-        flex-direction: row;
-    }
-
-    .button-row {
-        display: flex;
-        margin-top: $gutter;
-        width: $cols5;
-        align-content: stretch;
-
-        a {
-            margin-right: $gutter;
-            flex-grow: 1;
-        }
-
-        .button {
-            background-color: $ui-white;
-            padding: 13px 20px;
-            width: 100%;
-            color: $ui-blue;
-            font-size: .9rem;
-        }
-    }
-}

src/l10n.json

@@ -58,11 +58,6 @@
     "login.forgotPassword": "Forgot Password?",
     
     "navigation.signOut": "Sign out",
-
-    "cnbanner.makeItFly": "Make It Fly",
-    "cnbanner.seeExamples": "See examples",
-    "cnbanner.makeYourOwn": "Create your own",
-    "cnbanner.flyDescription": "With Scratch, you can program anything to fly. Animate the Scratch Cat, The Powerpuff Girls, or even a taco!",
     
     "parents.FaqAgeRangeA": "While Scratch is primarily designed for 8 to 16 year olds, it is also used by people of all ages, including younger children with their parents.",
     "parents.FaqAgeRangeQ": "What is the age range for Scratch?",

src/views/components/components.jsx

@@ -6,7 +6,6 @@ var Page = require('../../components/page/www/page.jsx');
 var Box = require('../../components/box/box.jsx');
 var Button = require('../../components/forms/button.jsx');
 var Carousel = require('../../components/carousel/carousel.jsx');
-var CNBanner = require('../../components/cn-banner/cn-banner.jsx');
 var Input = require('../../components/forms/input.jsx');
 var Spinner = require('../../components/spinner/spinner.jsx');
 
@@ -66,7 +65,6 @@ var Components = React.createClass({
                     <span className="splash-blue">$splash-blue</span>
                 </div>
             </div>
-            <CNBanner />
         </div>);
     }
 });

src/views/splash/splash.jsx

@@ -10,7 +10,6 @@ var Api = require('../../mixins/api.jsx');
 
 var Activity = require('../../components/activity/activity.jsx');
 var AdminPanel = require('../../components/adminpanel/adminpanel.jsx');
-var CNBanner = require('../../components/cn-banner/cn-banner.jsx');
 var DropdownBanner = require('../../components/dropdown-banner/banner.jsx');
 var Box = require('../../components/box/box.jsx');
 var Button = require('../../components/forms/button.jsx');
@@ -371,7 +370,6 @@ var Splash = injectIntl(React.createClass({
                                 {...omit(emailConfirmationStyle, 'padding')} />
                     </Modal>
                 ] : []}
-                <CNBanner />
                 <div key="inner" className="inner">
                     {this.props.session.user ? [
                         <div key="header" className="splash-header">

src/views/splash/splash.scss

@@ -27,10 +27,6 @@
         }
     }
 
-    .cn-banner {
-        margin-top: -20px;
-    }
-
     .box {
         margin-bottom: 20px;
     }