From b07b61c9259aa56953b1ec0ca11810c1d5b9f047 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 27 May 2016 15:55:08 -0400 Subject: [PATCH 1/5] Update conference to reflect being sold out --- src/views/conference/index/index.jsx | 11 +++++++++-- src/views/conference/index/index.scss | 7 +++++++ src/views/conference/plan/plan.jsx | 23 +++++++++++------------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/views/conference/index/index.jsx b/src/views/conference/index/index.jsx index 3625345a8..07f28aa30 100644 --- a/src/views/conference/index/index.jsx +++ b/src/views/conference/index/index.jsx @@ -21,10 +21,17 @@ var ConferenceSplash = React.createClass({

Scratch Conference 2016 | Cambridge, MA, USA

+

+ August 4 - 6 +

- + + We're sold out! Join the Waitlist + +
+

diff --git a/src/views/conference/index/index.scss b/src/views/conference/index/index.scss index 5419c41d8..3eedf1ea5 100644 --- a/src/views/conference/index/index.scss +++ b/src/views/conference/index/index.scss @@ -25,6 +25,13 @@ p { margin-top: 3rem; + b { + a { + text-decoration: underline; + color: $type-white; + } + } + a { button { diff --git a/src/views/conference/plan/plan.jsx b/src/views/conference/plan/plan.jsx index 09621cdc4..575cde510 100644 --- a/src/views/conference/plan/plan.jsx +++ b/src/views/conference/plan/plan.jsx @@ -262,6 +262,17 @@ var ConferencePlan = React.createClass({

FAQ

+
+ The conference is sold out. What can I do? +
+
+ Scratch@MIT is sold out and at capacity. However, you can{' '} + + join the waitlist + . People on the waitlist will be notified of openings on{' '} + a first come, first served basis. +
+
Who is this conference for?
@@ -279,18 +290,6 @@ var ConferencePlan = React.createClass({ Proposal submissions are now closed. -
- How much does it cost to register? -
-
- Through May 1, registration is $150 per ticket (Early Bird rate).{' '} - After May 1, registration increases to $250 per ticket. You can register{' '} - for the conference through the{' '} - - registration form - . -
-
I can only attend one day of the conference. Do you offer single-day{' '} registration? From 74ac6e52bb1f9dc6ac57b629f86f2ff7f60cc641 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 27 May 2016 15:55:27 -0400 Subject: [PATCH 2/5] conference formatting tweaks for mobile thanks @carljbowman! --- src/components/footer/conference/footer.jsx | 2 +- src/components/footer/conference/footer.scss | 2 +- .../navigation/conference/navigation.scss | 14 +++++++ src/components/thumbnail/thumbnail.scss | 9 ++--- src/views/conference/details/details.jsx | 38 ++++++++++--------- src/views/conference/details/details.scss | 13 +++++++ src/views/conference/schedule/schedule.scss | 22 +++++++++++ 7 files changed, 75 insertions(+), 25 deletions(-) diff --git a/src/components/footer/conference/footer.jsx b/src/components/footer/conference/footer.jsx index 48ad6531a..ba01d8030 100644 --- a/src/components/footer/conference/footer.jsx +++ b/src/components/footer/conference/footer.jsx @@ -71,7 +71,7 @@ var ConferenceFooter = React.createClass({ -

+

Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab.

diff --git a/src/components/footer/conference/footer.scss b/src/components/footer/conference/footer.scss index 4846c6007..951d6f85d 100644 --- a/src/components/footer/conference/footer.scss +++ b/src/components/footer/conference/footer.scss @@ -50,7 +50,7 @@ } li { - margin-bottom: .5rem; + margin: .0; } } } diff --git a/src/components/navigation/conference/navigation.scss b/src/components/navigation/conference/navigation.scss index 0c9cc38f0..fadeb0487 100644 --- a/src/components/navigation/conference/navigation.scss +++ b/src/components/navigation/conference/navigation.scss @@ -41,6 +41,20 @@ } } + @media only screen and (max-width: $mobile - 1) { + .inner { + > ul { + li { + &.right { + ul { + flex-flow: row nowrap; + } + } + } + } + } + } + @media only screen and (max-width: $tablet - 1) { height: 100px; diff --git a/src/components/thumbnail/thumbnail.scss b/src/components/thumbnail/thumbnail.scss index 29498673d..2a15edac2 100644 --- a/src/components/thumbnail/thumbnail.scss +++ b/src/components/thumbnail/thumbnail.scss @@ -14,14 +14,11 @@ .thumbnail-title, #{$extras} { + overflow: hidden; + text-overflow: ellipsis; line-height: normal; + white-space: nowrap; word-wrap: break-word; - - a { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } } .thumbnail-title { diff --git a/src/views/conference/details/details.jsx b/src/views/conference/details/details.jsx index 086f376a1..a1eb38a13 100644 --- a/src/views/conference/details/details.jsx +++ b/src/views/conference/details/details.jsx @@ -46,25 +46,29 @@ var ConferenceDetails = React.createClass({ ] : [

{this.props.conferenceDetails.Title}

, ,
- {this.props.conferenceDetails.Description} +

+ {this.props.conferenceDetails.Description} +

,
{this.props.conferenceDetails.fetching ? [] : [ diff --git a/src/views/conference/details/details.scss b/src/views/conference/details/details.scss index d562c480d..614814f1e 100644 --- a/src/views/conference/details/details.scss +++ b/src/views/conference/details/details.scss @@ -1,12 +1,18 @@ @import "../../../frameless"; #view { + @media only screen and (max-width: $tablet - 1) { + margin-top: 100px; + } + @media only screen and (max-width: $desktop - 1) { text-align: left; } } .details { + width: $cols8; + &.inner { margin-top: 2rem; @@ -41,3 +47,10 @@ margin: 2rem 0; } } + +//8 columns +@media only screen and (max-width: $desktop - 1) { + .details { + width: 100%; + } +} diff --git a/src/views/conference/schedule/schedule.scss b/src/views/conference/schedule/schedule.scss index 28827742a..3072824bc 100644 --- a/src/views/conference/schedule/schedule.scss +++ b/src/views/conference/schedule/schedule.scss @@ -102,6 +102,28 @@ } } + @media only screen and (max-width: $mobile - 1) { + .sub-nav { + flex-wrap: nowrap; + } + + .inner { + h2 { + &.breaking-title { + margin: 2rem 0 2rem; + height: 100%; + font-size: 1.5rem; + } + } + + .agenda-item { + h3 { + font-size: 1.2rem; + } + } + } + } + @media only screen and (max-width: $tablet - 1) { .inner { h2 { From c351d54e9b4162181e218707572b44940f8582ea Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 27 May 2016 16:02:38 -0400 Subject: [PATCH 3/5] fix lint warning thanks @rschamp! --- src/components/footer/conference/footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/footer/conference/footer.scss b/src/components/footer/conference/footer.scss index 951d6f85d..0cadb4934 100644 --- a/src/components/footer/conference/footer.scss +++ b/src/components/footer/conference/footer.scss @@ -50,7 +50,7 @@ } li { - margin: .0; + margin: 0; } } } From 011032308c6e38aa590eaa29acd41be68d083771 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 27 May 2016 16:19:51 -0400 Subject: [PATCH 4/5] Consolidate text thanks @carljbowman ! --- src/views/conference/index/index.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/conference/index/index.jsx b/src/views/conference/index/index.jsx index 07f28aa30..4a90cf9ab 100644 --- a/src/views/conference/index/index.jsx +++ b/src/views/conference/index/index.jsx @@ -19,10 +19,7 @@ var ConferenceSplash = React.createClass({ Many Paths, Many Styles

- Scratch Conference 2016 | Cambridge, MA, USA -

-

- August 4 - 6 + August 4 - 6, 2016 | Cambridge, MA, USA

From ad1e72318863b30cafe86b39158c4f3127dc59de Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 27 May 2016 16:35:23 -0400 Subject: [PATCH 5/5] Drop the text below the button thanks @carljbowman! --- src/views/conference/index/index.jsx | 9 +++++---- src/views/conference/index/index.scss | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/conference/index/index.jsx b/src/views/conference/index/index.jsx index 4a90cf9ab..9a6748883 100644 --- a/src/views/conference/index/index.jsx +++ b/src/views/conference/index/index.jsx @@ -22,16 +22,17 @@ var ConferenceSplash = React.createClass({ August 4 - 6, 2016 | Cambridge, MA, USA

- - We're sold out! Join the Waitlist - -

+

+ + We're sold out! Join the Waitlist + +

diff --git a/src/views/conference/index/index.scss b/src/views/conference/index/index.scss index 3eedf1ea5..4512d1537 100644 --- a/src/views/conference/index/index.scss +++ b/src/views/conference/index/index.scss @@ -25,7 +25,13 @@ p { margin-top: 3rem; + &.sub-button { + margin-top: 1rem; + } + b { + margin-top: 2rem; + a { text-decoration: underline; color: $type-white;