diff --git a/src/components/footer/conference/2018/footer.jsx b/src/components/footer/conference/2018/footer.jsx index bb49ca538..42c9d2753 100644 --- a/src/components/footer/conference/2018/footer.jsx +++ b/src/components/footer/conference/2018/footer.jsx @@ -47,14 +47,13 @@ const ConferenceFooter = props => (
  • - + LEGO Education
  • -
  • ( />
  • +
  • + + Cartoon Network + +
  • {this.props.conferenceDetails.Type} +
  • , +
  • + location icon + {this.props.conferenceDetails.Location}
  • ]} , diff --git a/src/views/conference/2018/expect/expect.jsx b/src/views/conference/2018/expect/expect.jsx index 4bfd092f2..b26f5141d 100644 --- a/src/views/conference/2018/expect/expect.jsx +++ b/src/views/conference/2018/expect/expect.jsx @@ -182,37 +182,37 @@ const ConferenceExpectations = () => ( - 8:30a + 8:30a-9:30a

    Breakfast (provided)

    - 9:30a + 9:30a-10:30a

    Keynote Presentation

    - 11:00a + 11:00a-12:30p

    Morning Workshops

    - 12:30p + 12:30p-1:30p

    Lunch (provided)

    - 2:00p + 2:00p-3:30p

    Afternoon Workshops

    - 4:00p + 4:00p-5:30p

    Poster Sessions

    @@ -231,50 +231,50 @@ const ConferenceExpectations = () => ( - 8:30a + 8:30a-9:30a

    Breakfast (provided)

    - 9:30a + 9:30a-10:30a

    Keynote Presentation

    - 11:00a + 11:00a-12:00p

    Morning Workshops, Panels, and Ignite Talks

    - 12:00p + 12:00p-1:00p

    Lunch (provided)

    - 1:30p + 1:30p-2:30p

    Early Afternoon Workshops, Panels, and Ignite Talks

    - 3:00p + 3:00p-4:00p

    Late Afternoon Workshops, Panels, and Ignite Talks

    - 4:30p + 4:30p-6:00p

    Poster Sessions

    - 6:30p -

    Conference Dinner

    + 6:00p-7:30p +

    Conference Dinner (provided)

    @@ -292,26 +292,26 @@ const ConferenceExpectations = () => ( - 8:30a + 8:30a-9:30a

    Breakfast (provided)

    - 9:30a + 9:30a-10:30a

    Keynote Presentation

    - 11:00a + 11:00a-12:00p

    Morning Workshops, Panels and Ignite Talks

    - 12:00p -

    Lunch (provided) and Wrap-up Session

    + 12:00p-1:30p +

    Closing Ceremony and Lunch (provided)

    diff --git a/src/views/conference/2018/expect/expect.scss b/src/views/conference/2018/expect/expect.scss index b96f42b9e..b2d685798 100644 --- a/src/views/conference/2018/expect/expect.scss +++ b/src/views/conference/2018/expect/expect.scss @@ -151,13 +151,14 @@ align-items: center; b { - width: 30%; + width: 40%; line-height: 1.7em; } p { margin: 0; - width: 70%; + padding-left: 20px; + width: 60%; } } } diff --git a/src/views/conference/2018/schedule/schedule.jsx b/src/views/conference/2018/schedule/schedule.jsx index d5f62db19..899aeac2e 100644 --- a/src/views/conference/2018/schedule/schedule.jsx +++ b/src/views/conference/2018/schedule/schedule.jsx @@ -53,6 +53,13 @@ class ConferenceSchedule extends React.Component { /> {item.Start} – {item.End}

    +

    + location icon + {item.Location} +

    @@ -81,8 +88,20 @@ class ConferenceSchedule extends React.Component { >

    {item.Title}

    -

    {item.Start} – {item.End}

    -

    {item.Location}

    +

    + time icon + {item.Start} – {item.End} +

    +

    + location icon + {item.Location} +

    ); diff --git a/static/images/conference/footer/2018/cartoon-network.png b/static/images/conference/footer/2018/cartoon-network.png new file mode 100644 index 000000000..01572ce4e Binary files /dev/null and b/static/images/conference/footer/2018/cartoon-network.png differ diff --git a/static/images/conference/footer/2018/lego-education.png b/static/images/conference/footer/2018/lego-education.png deleted file mode 100755 index e8b3f0431..000000000 Binary files a/static/images/conference/footer/2018/lego-education.png and /dev/null differ diff --git a/static/images/conference/footer/2018/lego-foundation.png b/static/images/conference/footer/2018/lego-foundation.png new file mode 100644 index 000000000..a27530de3 Binary files /dev/null and b/static/images/conference/footer/2018/lego-foundation.png differ