From 90ab0f75d0db81f05c5ffff190f9e4a15ce7dac3 Mon Sep 17 00:00:00 2001 From: Joel Gritter Date: Tue, 10 Jul 2018 17:29:25 -0400 Subject: [PATCH 1/8] Update wiki link --- src/components/footer/www/footer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index 523389516..74bd1add8 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -108,7 +108,7 @@ const Footer = props => (
- +
From 0f5778cab976ad85a74b7a33d89fd036838874bc Mon Sep 17 00:00:00 2001 From: jokebookservice1 Date: Thu, 19 Jul 2018 18:54:50 +0300 Subject: [PATCH 2/8] Add brycedtea to Credits page --- src/views/credits/credits.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 2c00af01c..2e64d0952 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -174,6 +174,14 @@ const Credits = () => ( Tracy Tang +
  • + Bryce Avatar + Bryce Taylor +
    • +
  • Matthew Avatar Date: Thu, 19 Jul 2018 08:59:43 -0700 Subject: [PATCH 3/8] Add Kathy Wu to credits --- src/views/credits/credits.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 2c00af01c..a5bc58bfa 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -173,7 +173,13 @@ const Credits = () => ( /> Tracy Tang
    • - + +
  • + Kathy Avatar + Kathy Wu
  • Matthew Avatar Date: Thu, 19 Jul 2018 09:07:08 -0700 Subject: [PATCH 4/8] Bug fix --- src/views/credits/credits.jsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index a5bc58bfa..db59d723b 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -174,12 +174,6 @@ const Credits = () => ( Tracy Tang
    • -
  • - Kathy Avatar - Kathy Wu
  • Matthew Avatar ( Moran Tsur
    • +
  • + Kathy Avatar + Kathy Wu +
    • +
  • Chris Avatar Date: Thu, 19 Jul 2018 09:08:20 -0700 Subject: [PATCH 5/8] Remove trailing spaces --- src/views/credits/credits.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index db59d723b..735e6a600 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -173,7 +173,7 @@ const Credits = () => ( /> Tracy Tang
    • - +
  • Matthew Avatar Date: Thu, 19 Jul 2018 10:57:09 -0700 Subject: [PATCH 6/8] Update credits.jsx --- src/views/credits/credits.jsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 735e6a600..dda102bf6 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -190,14 +190,6 @@ const Credits = () => ( Moran Tsur
    • -
  • - Kathy Avatar - Kathy Wu -
    • -
  • Chris Avatar ( Chris Willis-Ford
    • +
  • + Kathy Avatar + Kathy Wu +
    • +
  • Julia Avatar Date: Mon, 23 Jul 2018 16:49:13 -0400 Subject: [PATCH 7/8] Added link to keynote livestream --- src/views/conference/2018/index/index.jsx | 7 +++---- src/views/conference/2018/index/index.scss | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/conference/2018/index/index.jsx b/src/views/conference/2018/index/index.jsx index 98deb6a65..b2c1bd3b1 100644 --- a/src/views/conference/2018/index/index.jsx +++ b/src/views/conference/2018/index/index.jsx @@ -18,10 +18,9 @@ const ConferenceSplash = () => ( July 26-28, 2018 | Cambridge, MA, USA

    - (Opening Reception on Evening of July 25) -

    -

    - Scratch@MIT is sold out! + + Watch the keynotes live 7/26-7/28 at 9:30 a.m. EDT +

    diff --git a/src/views/conference/2018/index/index.scss b/src/views/conference/2018/index/index.scss index 853dbf255..705775faf 100644 --- a/src/views/conference/2018/index/index.scss +++ b/src/views/conference/2018/index/index.scss @@ -27,6 +27,13 @@ font-size: 4rem; } + h3 { + a { + text-decoration: underline; + color: $type-white; + } + } + p { margin-top: 1rem; From 767fabb22cfa71cb2a1843af88c00f0fbd41b6b2 Mon Sep 17 00:00:00 2001 From: Sean Hickey Date: Tue, 24 Jul 2018 12:12:17 -0400 Subject: [PATCH 8/8] Updated livestream link to proper URL --- src/views/conference/2018/index/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/conference/2018/index/index.jsx b/src/views/conference/2018/index/index.jsx index b2c1bd3b1..53ad6c25b 100644 --- a/src/views/conference/2018/index/index.jsx +++ b/src/views/conference/2018/index/index.jsx @@ -18,7 +18,7 @@ const ConferenceSplash = () => ( July 26-28, 2018 | Cambridge, MA, USA

    - + Watch the keynotes live 7/26-7/28 at 9:30 a.m. EDT