diff --git a/src/components/footer/conference/footer.scss b/src/components/footer/conference/footer.scss
index 008a04ffa..1d48eb06e 100644
--- a/src/components/footer/conference/footer.scss
+++ b/src/components/footer/conference/footer.scss
@@ -17,9 +17,9 @@
width: 100%;
ul {
- justify-content: space-between;
- align-items: center;
margin: 5px 0;
+ align-items: center;
+ justify-content: space-between;
img {
margin: 20px 0;
diff --git a/src/views/conference/2018/expect/expect.jsx b/src/views/conference/2018/expect/expect.jsx
index 41cf9cc06..29067a55f 100644
--- a/src/views/conference/2018/expect/expect.jsx
+++ b/src/views/conference/2018/expect/expect.jsx
@@ -109,16 +109,13 @@ const ConferenceExpectations = () => (
@@ -134,8 +131,8 @@ const ConferenceExpectations = () => (
![Ricarose Photo](/images/conference/expect/2018/ricarose.png)
@@ -146,7 +143,7 @@ const ConferenceExpectations = () => (
What is it like to grow up with Scratch? Three long-time Scratch community{' '}
members share how they have used Scratch to express their interests, to make{' '}
- friends, and to lead initiatives in their communities.
+ friends, and to lead initiatives in their communities.
diff --git a/src/views/conference/2018/expect/expect.scss b/src/views/conference/2018/expect/expect.scss
index 58c023085..b96f42b9e 100644
--- a/src/views/conference/2018/expect/expect.scss
+++ b/src/views/conference/2018/expect/expect.scss
@@ -100,8 +100,8 @@
.schedule {
.title {
- margin-top: 20px;
display: flex;
+ margin-top: 20px;
justify-content: space-between;
align-items: center;
diff --git a/src/views/conference/2018/index/index.scss b/src/views/conference/2018/index/index.scss
index 223e22b4c..853dbf255 100644
--- a/src/views/conference/2018/index/index.scss
+++ b/src/views/conference/2018/index/index.scss
@@ -10,8 +10,8 @@
.title-banner {
margin-bottom: 0;
background-image: url("/images/conference/index/2018/title-banner.jpg");
- padding: 48px 0;
background-position: top;
+ padding: 48px 0;
h1,
h3,
@@ -24,7 +24,7 @@
}
h1 {
- font-size: 4.0rem;
+ font-size: 4rem;
}
p {
diff --git a/src/views/conference/2018_old/index/index.jsx b/src/views/conference/2018_old/index/index.jsx
deleted file mode 100644
index f570bf665..000000000
--- a/src/views/conference/2018_old/index/index.jsx
+++ /dev/null
@@ -1,211 +0,0 @@
-const FormattedDate = require('react-intl').FormattedDate;
-const FormattedMessage = require('react-intl').FormattedMessage;
-const React = require('react');
-const render = require('../../../../lib/render.jsx');
-
-const FlexRow = require('../../../../components/flex-row/flex-row.jsx');
-const Page = require('../../../../components/page/conference/2018/page.jsx');
-const TitleBanner = require('../../../../components/title-banner/title-banner.jsx');
-
-require('../../../../components/forms/button.scss');
-require('./index.scss');
-
-const ConferenceSplash = () => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {' '}
- {/* eslint-disable react/jsx-sort-props */}
-
- {' - '}
-
- {/* eslint-enable react/jsx-sort-props */}
-
-
-
- {' '}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- conference@scratch.mit.edu
-
- )
- }}
- />
-
-
-
-
-
-
-
-
-
-
- conference@scratch.mit.edu
-
- )
- }}
- />
-
-
-
-
-
-
-
-
-);
-
-render(
, document.getElementById('app'));
diff --git a/src/views/conference/2018_old/index/index.scss b/src/views/conference/2018_old/index/index.scss
deleted file mode 100644
index a93b44c9e..000000000
--- a/src/views/conference/2018_old/index/index.scss
+++ /dev/null
@@ -1,253 +0,0 @@
-@import "../../../../colors";
-@import "../../../../frameless";
-
-.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;
- }
-
- h4 {
- font-weight: normal;
- }
-
- p {
- margin-top: 3rem;
-
- &.sub-button {
- margin-top: 1rem;
- }
-
- b {
- margin-top: 2rem;
-
- a {
- text-decoration: underline;
- color: $type-white;
- }
- }
-
- a {
-
- button {
-
- }
- }
- }
-
- @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%;
- }
- }
- }
- }
-}
-
-@media only screen and (max-width: $tablet - 1) {
- .index {
- .flex-row {
- align-items: center;
- }
- }
-}
-
-.conf2018-panel {
- border-bottom: 1px solid $ui-border;
-}
-
-.conf2018-panel.mod-last {
- border-bottom: 0;
-}
-
-.flex-row.conf2018-panel-title {
- justify-content: flex-start;
- align-items: center;
-}
-
-.conf2018-panel-desc {
- margin: 2rem 0;
-}
-
-td {
- padding: .75rem 1.25rem;
- vertical-align: top;
-}
-
-.conf2018-panel-row-icon-image {
- margin-top: .125rem;
- width: 1rem;
- height: 1rem;
-}
-
-
-.button.mod-register {
- padding: .75em 3.5em;
-
- text-align: center;
- color: $type-white;
- font-size: 1rem;
- font-weight: 500;
-}
-
-@media only screen and (max-width: $mobile - 1) {
- .index.mod-2018 {
- text-align: left;
- }
-
- .title-banner-image.mod-2018 {
- height: 10rem;
- }
-
- .conf2018-panel,
- .title-banner-h3.mod-2018 {
- width: initial;
- }
-
- .conf2018-panel {
- margin: auto .5rem;
- }
-
- .title-banner-h3.mod-2018 {
- margin: 1rem .5rem .5rem;
- font-size: 1.1rem;
- }
-
- .flex-row.conf2018-panel-title {
- flex-direction: row;
- }
-
- .conf2018-panel-title-text {
- max-width: 14rem;
- }
-
- .conf2018-panel-row > td {
- padding: .75rem .375rem .75rem 0;
- }
-}
-
-@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
- .index.mod-2018 {
- text-align: left;
- }
-
- .title-banner-image.mod-2018 {
- height: 10rem;
- }
-
- .conf2018-panel,
- .title-banner-h3.mod-2018 {
- margin: auto .5rem ;
- width: initial;
- }
-
- .title-banner-h3.mod-2018 {
- font-size: 1.1rem;
- }
-
- .flex-row.conf2018-panel-title {
- flex-direction: row;
- }
-
- .conf2018-panel-title-text {
- max-width: 18.75rem;
- }
-
- .button.mod-register {
- padding: .75em 2em;
- }
-}
-
-@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
- .index.mod-2018 {
- text-align: left;
- }
-
- .title-banner-image.mod-2018 {
- height: 15rem;
- }
-
- .conf2018-panel,
- .title-banner-h3.mod-2018 {
- margin: auto;
- width: 38.75rem;
- }
-
- .title-banner-h3.mod-2018 {
- font-size: 1.1rem;
- }
-
- .button.mod-register {
- padding: .75em 1.25em;
- }
-}
diff --git a/src/views/conference/2018_old/index/l10n.json b/src/views/conference/2018_old/index/l10n.json
deleted file mode 100644
index 7b0893a45..000000000
--- a/src/views/conference/2018_old/index/l10n.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "conference-2018.title": "Scratch Conference 2018:",
- "conference-2018.subtitle": "The Next Generation",
- "conference-2018.dateDesc": "July 26-28, 2018 | Cambridge, MA, USA",
- "conference-2018.dateDescMore": " (with opening reception the evening of July 25)",
- "conference-2018.locationDetails": "MIT Media Lab, Cambridge, MA",
- "conference-2018.seeBelow": "Learn more about conference dates and locations below.",
-
- "conference-2018.date": "When:",
- "conference-2018.location": "Where:",
-
- "conference-2018.desc1": "Join us for the Scratch@MIT conference, a playful gathering of educators, researchers, developers, and other members of the worldwide Scratch community.",
- "conference-2018.desc2": "We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration. The conference is intended primarily for adults who support young people learning Scratch.",
- "conference-2018.registrationDate": "Registration opens March 1, 2018.",
- "conference-2018.registerNow": "Register Now!",
- "conference-2018.soldOut": "Scratch@MIT is sold out!",
- "conference-2018.comingSoon": "Full event schedule coming soon",
- "conference-2018.sessionDesc": "Interested in offering a session? We invite four types of proposals:",
- "conference-2018.sessionItem1Title": "Poster/demonstration (90 minutes).",
- "conference-2018.sessionItem1Desc": "Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
- "conference-2018.sessionItem2Title": "Hands-on workshop (90 minutes).",
- "conference-2018.sessionItem2Desc": "Engage participants in hands-on activities, highlighting new ways of creating and collaborating with Scratch.",
- "conference-2018.sessionItem3Title": "Interactive panel (60 minutes).",
- "conference-2018.sessionItem3Desc": "Discuss a Scratch-related topic in a panel with three or more people. Your proposal should describe how you will engage the audience during the session.",
- "conference-2018.sessionItem4Title": "Ignite talk (5 minutes).",
- "conference-2018.sessionItem4Desc": "Share what you've been doing in a short, lively presentation.",
-
- "conference-2018.deadline": "Deadline for proposals is February 5, 2018.",
- "conference-2018.proposal": " Submit Your Proposal",
- "conference-2018.proposalDeadline": "Deadline for proposals: February 5",
- "conference-2018.proposalAccept": "Notification of acceptance: March 1",
-
- "conference-2018.registrationTitle": "Registration:",
- "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.questionsTitle": "Questions:",
- "conference-2018.soldoutQ": "The conference is sold out. What can I do?",
- "conference-2018.soldoutAns": "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.",
- "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.",
- "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 additional accommodation options, we also recommend the {acLink} (7.1 miles), {doubletreeLink} (3.3 miles), and {hotelbostonLink} with the code MITSC2018 (5.3 mile). You might also consider home-share options such as Airbnb. Find an extended list of accommodations {mitLink}.",
- "conference-2018.here": "here",
- "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}."
-}