Merge pull request #586 from mewtaylor/issue/conference-updates

Fix GH-[571,563] – updates to the conference site

src/components/footer/conference/footer.jsx

@@ -13,36 +13,48 @@ var ConferenceFooter = React.createClass({
                 <div className="collaborators">
                     <h4>Sponsors</h4>
                     <FlexRow as="ul">
-                        <li>
+                        <li className="odl">
                             <a href="https://odl.mit.edu/">
                                 <img src="/images/conference/footer/mit-odl.png"
                                      alt="MIT Office of Digital Learning" />
                             </a>
                         </li>
-                        <li>
+                        <li className="scratchfoundation">
                             <a href="http://www.scratchfoundation.org/">
                                 <img src="/images/conference/footer/scratch-foundation.png"
                                      alt="Scratch Foundation" />
                             </a>
                         </li>
-                        <li>
+                        <li className="lego">
                             <a href="http://www.legofoundation.com/">
                                 <img src="/images/conference/footer/lego-foundation.png"
                                      alt="LEGO Foundation" />
                             </a>
                         </li>
-                        <li>
+                        <li className="google">
                             <a href="http://www.google.com/">
                                 <img src="/images/conference/footer/google.png"
                                      alt="Google" />
                             </a>
                         </li>
-                        <li>
+                        <li className="siegel">
                             <a href="http://www.siegelendowment.org/">
                                 <img src="/images/conference/footer/siegel-endowment.png"
                                      alt="Siegel Family Endowment" />
                             </a>
                         </li>
+                        <li className="nostarch">
+                            <a href="https://www.nostarch.com/">
+                                <img src="/images/conference/footer/no-starch.png"
+                                     alt="No Starch Press" />
+                            </a>
+                        </li>
+                        <li className="intel">
+                            <a href="http://www.intel.com/content/www/us/en/homepage.html">
+                                <img src="/images/conference/footer/intel.png"
+                                     alt="Intel" />
+                            </a>
+                        </li>
                     </FlexRow>
                 </div>
                 <FlexRow className="scratch-links">

src/components/footer/conference/footer.scss

@@ -23,7 +23,19 @@
                 img {
                     margin: 20px 0;
                     max-width: 180px;
-                    max-height: 30px;
+                    max-height: 25px;
+                }
+            }
+
+            .nostarch {
+                img {
+                    max-height: 40px;
+                }
+            }
+
+            .intel {
+                img {
+                    max-height: 50px
                 }
             }
         }

src/views/conference/expect/expect.jsx

@@ -167,7 +167,7 @@ var ConferenceExpectations = React.createClass({
                                 <tr>
                                     <td>
                                         <b>2:00p</b>
-                                        <p>Afternoon workshops</p>
+                                        <p>Afternoon Workshops</p>
                                     </td>
                                 </tr>
                                 <tr>
@@ -271,7 +271,7 @@ var ConferenceExpectations = React.createClass({
                                 <tr>
                                     <td>
                                         <b>12:00p</b>
-                                        <p>Lunch (provided)</p>
+                                        <p>Lunch (provided) and Wrap-up Session</p>
                                     </td>
                                 </tr>
                             </tbody>

src/views/conference/index/index.jsx

@@ -30,7 +30,7 @@ var ConferenceSplash = React.createClass({
                     </p>
                     <p className="sub-button">
                         <b>
-                            We're sold out! <a href="//scratchconference2016.eventbrite.com">Join the Waitlist</a>
+                            Scratch@MIT is sold out!
                         </b>
                     </p>
                 </TitleBanner>

src/views/conference/index/index.scss

@@ -31,11 +31,6 @@
 
             b {
                 margin-top: 2rem;
-
-                a {
-                    text-decoration: underline;
-                    color: $type-white;
-                }
             }
 
             a {

src/views/conference/plan/plan.jsx

@@ -266,11 +266,11 @@ var ConferencePlan = React.createClass({
                                         The conference is sold out. What can I do?
                                     </dt>
                                     <dd>
-                                        Scratch@MIT is sold out and at capacity. However, you can{' '}
-                                        <a href="//scratchconference2016.eventbrite.com">
-                                            join the waitlist
-                                        </a>. People on the waitlist will be notified of openings on{' '}
-                                        a first come, first served basis.
+                                        Scratch@MIT is sold out and at capacity. Regrettably, we are{' '}
+                                        unable to add any additional guests. Please keep in mind that{' '}
+                                        you must have registered on Eventbrite to attend Scratch@MIT;{' '}
+                                        people who are not registered / do not have a ticket will not be{' '}
+                                        able to attend the conference.
                                     </dd>
                                     
                                     <dt>