Merge pull request #1796 from chrisgarrity/hotfix/conf2018-feb5

[DEVELOP] Hotfix Conference page to close session proposals

src/components/navigation/conference/2018/navigation.jsx

@@ -8,17 +8,48 @@ const Navigation = () => (
     <NavigationBox>
         <ul className="ul mod-2018">
             <li className="li-left mod-logo mod-2018">
-                <a
-                    className="logo-a"
-                    href="/"
-                >
-                    <img
-                        alt="Scratch Logo"
-                        className="logo-a-image"
-                        src="/images/logo_sm.png"
-                    />
-                    <p className="logo-a-title">Conferences</p>
-                </a>
+                <ul className="li-left-ul mod-2018">
+                    <li>
+                        <a
+                            className="logo-a"
+                            href="/"
+                        >
+                            <img
+                                alt="Scratch Logo"
+                                className="logo-a-image"
+                                src="/images/logo_sm.png"
+                            />
+                        </a>
+                    </li>
+                    <li>
+                        <a
+                            className="link-a"
+                            href="/conference"
+                        >
+                            <span className="logo-a-title">Conference</span>
+                        </a>
+                    </li>
+                </ul>
+            </li>
+            <li className="li-right mod-2018">
+                <ul className="li-right-ul mod-2018">
+                    <li className="link info">
+                        <a
+                            className="link-a"
+                            href="#info"
+                        >
+                            Registration Info
+                        </a>
+                    </li>
+                    <li className="link questions">
+                        <a
+                            className="link-a"
+                            href="#questions"
+                        >
+                            Questions
+                        </a>
+                    </li>
+                </ul>
             </li>
         </ul>
     </NavigationBox>

src/components/navigation/conference/2018/navigation.scss

@@ -2,15 +2,23 @@
 @import "../../../../frameless";
 
 #navigation {
-    .ul.mod-2018 {
+    .ul.mod-2018,
+    .li-right-ul.mod-2018,
+    .li-left-ul.mod-2018 {
         display: flex;
         justify-content: space-between;
         flex-flow: row nowrap;
         align-items: center;
         list-style-type: none;
     }
+    
+    .li-left-ul.mod-2018 {
+        padding-left: 0;
+    }
 
-    .li-left.mod-2018 {
+    .li-left,
+    .li-right,
+    .link {
         margin-top: 0;
         margin-right: 10px;
         color: $type-white;
@@ -36,4 +44,47 @@
         font-size: .85rem;
         font-weight: bold;
     }
+
+    @media only screen and (max-width: $mobile - 1) {
+        .li-right-ul.mod-2018 {
+            flex-flow: row nowrap;
+        }
+
+        .link {
+            margin: 0;
+            padding: 0;
+        }
+
+        .link-a {
+            font-size: .75rem;
+        }
+    }
+
+    @media only screen and (max-width: $tablet - 1) {
+        height: 100px;
+
+        .ul.mod-2018 {
+            justify-content: center;
+            flex-flow: row wrap;
+        }
+
+        .li-left,
+        .li-right,
+        .link {
+            align-self: center;
+        }
+
+        .li-right {
+            margin-left: 0;
+            align-self: center;
+        }
+
+        .logo-a {
+            padding-top: 6px;
+        }
+
+        .logo-a-image {
+            padding-left: 15px;
+        }
+    }
 }

src/views/conference/2018/index/index.scss

 @import "../../../../colors";
 @import "../../../../frameless";
 
-.title-banner.mod-conference.mod-2018 {
-    padding-top: 0;
-}
-
-.title-banner-image.mod-2018 {
-    opacity: .75;
-    margin-bottom: 1.75rem;
-    background-image: url("/images/conference/index/2018/title-banner.jpg");
-    background-position: center;
-    background-size: cover;
-    width: 100%;
-    height: 20rem;
-}
-
-.title-banner-h1.mod-2018 {
-    line-height: 1.25em;
-}
-
-.conf2018-panel,
-.title-banner-h3.mod-2018 {
-    margin: auto;
-    width: 48.75rem;
+.index {
+    .title-banner {
+        margin-bottom: 0;
+        background-image: url("/images/conference/index/2018/title-banner.jpg");
+        background-position: top;
+        padding: 48px 0;
+
+        h1,
+        h3,
+        h4,
+        p {
+            margin: 0 auto;
+            padding: 5px 0;
+            text-align: center;
+            color: $type-white;
+        }
+
+        p {
+            margin-top: 3rem;
+
+            &.sub-button {
+                margin-top: 1rem;
+            }
+
+            b {
+                margin-top: 2rem;
+
+                a {     
+                    text-decoration: underline;       
+                    color: $type-white;       
+                }
+            }
+
+            a {
+
+                button {
+                    background-color: $ui-white;
+                    color: $ui-blue;
+                    font-size: 1rem;
+                }
+            }
+        }
+
+        @media only screen and (max-width: $mobile - 1) {
+            h3 {
+                display: none;
+                margin-top: 0;
+            }
+
+            p {
+                margin-top: .25rem;
+            }
+
+        }
+
+        @media only screen and (max-width: $desktop - 1) {
+            h1 {
+                font-size: 2.5rem;
+            }
+
+            p {
+                margin-top: 1.5rem;
+            }
+        }
+    }
+
+    .flex-row {
+        align-items: flex-start;
+        justify-content: space-between;
+
+        &.uneven {
+            img {
+                width: 100%;
+            }
+
+            @media only screen and (max-width: $tablet - 1) {
+                img {
+                    width: 30%;
+                }
+            }
+
+            @media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
+                img {
+                    width: 70%;
+                }
+            }
+        }
+    }
+
+    .info {
+        text-align: left;
+        
+        .conf2018-question {
+            margin-bottom: 0;
+            font-weight: 500;
+        }
+        
+        .conf2018-answer {
+            margin-top: 0;
+        }
+        
+        @media only screen and (max-width: $desktop - 1) {
+            .uneven {
+                .short {
+                    width: 70%;
+                }
+            }
+        }
+    }
 }
 
-.title-banner-h3.mod-2018 {
-    text-align: center;
-    color: $type-white;
+@media only screen and (max-width: $tablet - 1) {
+    .index {
+        .flex-row {
+            align-items: center;
+        }
+    }
 }
 
 .conf2018-panel {

src/views/conference/2018/index/l10n.json

@@ -32,5 +32,29 @@
     "conference-2018.registrationEarly": "Early Bird Registration (March 1-May 1): $200",
     "conference-2018.registrationStandard": "Standard Registration (after May 1): $300",
 
-    "conference-2018.questions": "Questions? Contact the Scratch Team at {emailLink}"
+    "conference-2018.questions": "Questions? Contact the Scratch Team at {emailLink}",
+    "conference-2018.questionsTitle": "Questions:",
+    "conference-2018.submissionQ": "I missed the submission deadline. Can I still submit a proposal for the conference?",
+    "conference-2018.submissionAns": "We are no longer accepting proposal submissions. We will send out proposal acceptance notifications on February 28.",
+    "conference-2018.regQ": "I can only attend one day of the conference. Do you offer single-day registration?",
+    "conference-2018.regAns": "Sorry, we are not offering single-day tickets.",
+    "conference-2018.accommodationsQ": "I want to plan my visit. Do you have suggestions for accommodations?",
+    "conference-2018.accommodationsAns1": "Yes, MIT partners with several hotels in the area who offer discounts to participants attending MIT events, including: {marriottLink} (0.4 miles from the MIT Media Lab), {holidayinnLink} (1.6 miles), {residenceinnLink} (0.3 miles), and {lemeridienLink} (0.9 miles). To reserve a room at one of these hotels, call the hotel and request the MIT discount. Advance booking is strongly recommended, as summer is a busy time in Boston. All MIT rates are subject to availability.",
+    "conference-2018.accommodationsAns2": "If you are looking for lower-cost accommodations, we also recommend the {acLink} (7.1 miles). You might also consider home-share options such as Airbnb. Find an extended list of accommodations {mitLink}.",
+    "conference-2018.here": "here",
+    "conference-2018.accommodationsAns3": "Limited lodging is available in {neuLink} dorms rooms at the following rates:",
+    "conference-2018.apartment": "Apartment",
+    "conference-2018.suite": "Suite",
+    "conference-2018.single": "Single",
+    "conference-2018.double": "Double",
+    "conference-2018.pp": "/person/night",
+    "conference-2018.accommodationsAns4": "To request a dorm room, please email us at {emailLink} with the subject line “Dorm room.” Please note that Northeastern is located in Boston, two miles from the conference site at MIT. It is a half-hour commute via public transportation, accessible by subway via the Green Line (the Northeastern stop on the E line) or the Orange Line (Ruggles Station stop).",
+    "conference-2018.letterQ": "Can I get a visa letter?",
+    "conference-2018.letterAns": "Yes. Contact us at {emailLink}, and we can email you a letter.",
+    "conference-2018.preConfQ": "In previous years, there was an event on Wednesday evening before the conference. Will you be hosting something similar this year?",
+    "conference-2018.preConfAns": "There will be an informal, optional reception the evening of Wednesday, July 25. Participants may register early at this time as well.",
+    "conference-2018.bringQ": "What should I bring?",
+    "conference-2018.bringAns": "Plan to bring your personal device (laptops are preferred) and power cord. Presenters should plan to bring all additional presentation materials (we will provide projectors and screens). Snacks and beverages will be available throughout the day.",
+    "conference-2018.moreQ": "Have additional questions?",
+    "conference-2018.moreAns": "Contact the Scratch Team at {emailLink}."
 }