From 99cedec97866e31ed0acc263615f767f9f292da5 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 30 Sep 2016 15:01:20 -0400 Subject: [PATCH 1/4] =?UTF-8?q?Put=20label=20for=20=E2=80=9CNot=20Required?= =?UTF-8?q?=E2=80=9D=20above=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #933 --- src/components/forms/row.scss | 5 +++++ src/components/registration/steps.jsx | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/forms/row.scss b/src/components/forms/row.scss index 43373ddd2..17a8e3fa8 100644 --- a/src/components/forms/row.scss +++ b/src/components/forms/row.scss @@ -20,3 +20,8 @@ } } } + +.row-label { + margin-bottom: .75rem; + line-height: 1.7rem; +} diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 45e3064d9..45ae14930 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -741,8 +741,15 @@ module.exports = { required /> : [] } - + + + {this.state.countryChoice !== 'us' ? +

+ +

: [] + } + + required={(this.state.countryChoice === 'us') ? true : 'isFalse'} /> } /> From 6fa1c13cfb3c905688ecffe5217c2cd4646d1e39 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Mon, 3 Oct 2016 11:38:10 -0400 Subject: [PATCH 2/4] Move Randy Jou to previous Scratch Team section --- src/views/credits/credits.jsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index cd8d31a44..7fa6ae0d1 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -80,11 +80,6 @@ var Credits = React.createClass({ Christan Balch -
  • - Randy Avatar - Randy Jou -
    • -
  • Colby Avatar Colby Gutierrez-Kraybill @@ -198,7 +193,7 @@ var Credits = React.createClass({ Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond, Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini, Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, - Tammy Stern, Lis Sylvan, Claudia Urrea, Ben Berg, Hannah Cole, and Andrea Saxman. + Tammy Stern, Lis Sylvan, Claudia Urrea, Ben Berg, Hannah Cole, Andrea Saxman, and Randy Jou.

    Design and Development Partners

    From c44742e66823ddaa7b448d6c24bf3cfd56e0b743 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 3 Oct 2016 16:04:19 -0400 Subject: [PATCH 3/4] Slight content edits to hoc page updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer! --- src/views/hoc/hoc.jsx | 24 ++++-------------------- src/views/hoc/hoc.scss | 7 +++++-- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx index 89230e1fb..2b2594833 100644 --- a/src/views/hoc/hoc.jsx +++ b/src/views/hoc/hoc.jsx @@ -217,7 +217,7 @@ var Hoc = React.createClass({
    - +
    - +
    - -     - - -
    diff --git a/src/views/hoc/hoc.scss b/src/views/hoc/hoc.scss index f6b098ab6..43b9b4f22 100644 --- a/src/views/hoc/hoc.scss +++ b/src/views/hoc/hoc.scss @@ -126,8 +126,11 @@ $base-bg: $ui-white; line-height: inherit; } +.flex-row.mod-studio { + justify-content: space-between; +} + .hoc-section-studio { - width: 50%; align-items: center; } @@ -137,7 +140,7 @@ $base-bg: $ui-white; .hoc-section-studio-info-header { margin: 8px 0; - width: 200px; + width: 150px; color: $ui-blue; font-weight: 500; } From 6bcc7eeae30d35d79bb47a81d18b777265edc9fc Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 3 Oct 2016 16:40:57 -0400 Subject: [PATCH 4/4] Update make it fly hoc image to be higher res Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time. --- src/views/hoc/hoc.jsx | 2 +- static/images/hoc/make-it-fly-tutorial.jpg | Bin 0 -> 14684 bytes static/images/hoc/make-it-fly-tutorial.png | Bin 121005 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 static/images/hoc/make-it-fly-tutorial.jpg delete mode 100644 static/images/hoc/make-it-fly-tutorial.png diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx index 2b2594833..1d3a72df9 100644 --- a/src/views/hoc/hoc.jsx +++ b/src/views/hoc/hoc.jsx @@ -56,7 +56,7 @@ var Hoc = React.createClass({