From 29f886f4d2bcb7aad752bee3071e0dfc33b41f6e Mon Sep 17 00:00:00 2001 From: William Wu Date: Sat, 25 Jul 2020 02:25:38 -0400 Subject: [PATCH 01/25] MLH Code of Conduct button no longer hidden on mobile --- src/nav-bar.js | 2 +- src/preregister.js | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/nav-bar.js b/src/nav-bar.js index 070407f24..6d1370530 100644 --- a/src/nav-bar.js +++ b/src/nav-bar.js @@ -31,7 +31,7 @@ class NavBar extends React.Component { diff --git a/src/preregister.js b/src/preregister.js index df8091fde..0a0eb4444 100644 --- a/src/preregister.js +++ b/src/preregister.js @@ -4,6 +4,7 @@ import MailchimpInput from "./mailchimp-input.js"; import CovidPopover from "./covid-popover.js"; var HeroImage = require('./hero.svg'); +var HeroImageAlt = "A decorative hero graphic." var desktopNotice = "COVID-19 Notice: " var mobileNotice = "COVID-19 Notice" @@ -29,20 +30,16 @@ class PreRegister extends React.Component {
Feb 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY
- - A decorative background hero graphic. - + {HeroImageAlt}/ - -
- A decorative background hero graphic. + {HeroImageAlt}/
From 070c22f7ab79e2f8cb996f4816588cc4fdfd7602 Mon Sep 17 00:00:00 2001 From: William Wu Date: Sat, 25 Jul 2020 03:55:09 -0400 Subject: [PATCH 02/25] Nav-bar fixed, sections take up screen height & are vertically centered --- src/index.scss | 63 +++++++++++++++++++++++++--------------------- src/nav-bar.js | 17 ++++++------- src/preregister.js | 14 +++++------ 3 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/index.scss b/src/index.scss index 6d38b1d61..f5eb796bf 100644 --- a/src/index.scss +++ b/src/index.scss @@ -22,7 +22,7 @@ $mobile-width: 720px; @media(max-width: #{$mobile-width}) { @content; } } -//override sass min() & max(), use css +//override sass min() & max() fn's, use css's @function min($numbers...) { @return m#{i}n(#{$numbers}); } @@ -58,11 +58,6 @@ html, body, #root, #app, .full-height { flex-shrink: 0; } -.full-height { /* not really a good way to do it, will probably change to flex column layout */ - height: calc(100% - 445px); - display: flex; - flex-direction: column; -} .desktop-banner { width: 100%; @@ -74,9 +69,10 @@ html, body, #root, #app, .full-height { background-color: $blue; color: white; -} -.desktop-banner span { - font-weight: 400; + + span { + font-weight: 400; + } } #mlh-badge { @@ -99,14 +95,13 @@ html, body, #root, #app, .full-height { } .navigation { - display: inline-block; - width: 100%; font-size: 15px; font-weight: 500; color: $blue; + background-color: white; ul { list-style-type: none; @@ -136,6 +131,8 @@ html, body, #root, #app, .full-height { } @include tablet { + display: inline-block; + font-size: 12px; font-weight: 400; @@ -168,15 +165,23 @@ html, body, #root, #app, .full-height { margin-bottom: max(1px, calc(10vh - 40px), calc(30vh - 190px)); } } + .section { + height: 100%; + display: flex; + flex-direction: column; +} + +.content { width: 100%; - max-width: 1100px; + + max-width: $desktop-width; text-align: center; margin: auto; - @include tablet { flex-direction: column; + margin: 0px; } } @@ -203,8 +208,8 @@ note: development on a mac may not have all font-weights, lines of text may be wider than they appear */ #hackathon-name { - height: 65px; - font-size: 60px; + height: 75px; + font-size: 70px; font-weight: 700; color: $blue; @@ -214,8 +219,8 @@ lines of text may be wider than they appear } } #hackathon-description { - height: 37px; - font-size: 28.0px; + height: 43px; + font-size: 34px; font-weight: 700; color: $blue; @@ -225,8 +230,8 @@ lines of text may be wider than they appear } } #hackathon-info { - height: 20px; - font-size: 14px; + height: 25px; + font-size: 17px; font-weight: 500; color: $blue; @@ -237,8 +242,8 @@ lines of text may be wider than they appear } .mailchimp-container { - height: 40px; - width: 375px; + height: 50px; + width: 450px; margin: auto; margin-top: 10px; @@ -246,7 +251,7 @@ lines of text may be wider than they appear border-style: solid; border-width: 1px; border-color: $blue; - border-radius: 20px; + border-radius: 25px; @include mobile { width: 80vw; @@ -267,7 +272,7 @@ lines of text may be wider than they appear outline: none; font-family: inherit; - font-size: 14px; + font-size: 17px; font-weight: 500; &::placeholder { /* this refers to the input placeholder text (enter your email...)*/ @@ -284,28 +289,28 @@ lines of text may be wider than they appear } } .mailchimp-button { - height: 30px; - width: 30px; + height: 40px; + width: 40px; margin-right: 5px; border-style: solid; border-width: 1px; border-color: $blue; - border-radius: 15px; + border-radius: 20px; background-color: white; background-image: url(./input-arrow.svg); background-repeat: no-repeat; - background-position: 3.75px; - background-size: 18px; + background-position: 4.5px; + background-size: 25px; outline: none; transition: 0.1s; @include desktop { &:hover { - background-position: 5.25px; + background-position: 6.5px; } } diff --git a/src/nav-bar.js b/src/nav-bar.js index 6d1370530..c73989386 100644 --- a/src/nav-bar.js +++ b/src/nav-bar.js @@ -2,30 +2,29 @@ import React from 'react'; class NavBar extends React.Component { componentDidMount(){ - /* - var fixedContainer = document.getElementById("fixed-container"); + var fixedContainer = document.getElementById("navigation-container"); var children = Array.from(fixedContainer.children); children.forEach(child => { var clone = child.cloneNode(true); clone.removeAttribute("id"); clone.style.visibility = "hidden"; - + clone.classList.add("desktop-hide"); + child.style.position = "fixed"; fixedContainer.append(child); fixedContainer.append(clone); }); - */ } render(){ return( -
-
- {this.props.title}{this.props.content} -
- + From fff778e83671f4649179ebbd4eac9dc68e787883 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Sat, 22 Aug 2020 19:28:09 -0400 Subject: [PATCH 07/25] Merge branch 'develop' into centering --- src/index.scss | 4 ---- src/preregister.js | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/index.scss b/src/index.scss index 549105a56..2071b843e 100644 --- a/src/index.scss +++ b/src/index.scss @@ -178,10 +178,6 @@ html, body, #root, #app, .full-height { max-width: $desktop-width; text-align: center; margin: auto; -<<<<<<< HEAD -======= - ->>>>>>> develop @include tablet { flex-direction: column; diff --git a/src/preregister.js b/src/preregister.js index 856c6bbec..88332f44e 100644 --- a/src/preregister.js +++ b/src/preregister.js @@ -14,12 +14,13 @@ class PreRegister extends React.Component { render() { return (
-
- -
+ + +
+
BRICKHACK 7 @@ -30,21 +31,18 @@ class PreRegister extends React.Component {
Feb 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY
- - A decorative background hero graphic. - + {heroImageAlt}/ - +

interested in sponsoring?

email sponsorship@coderit.org

- -
From 43694fa0f5eb39deeb3c4ecb1f0d19a113c9fe41 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Sat, 22 Aug 2020 19:47:49 -0400 Subject: [PATCH 08/25] Changed the console comment into an HTML comment --- public/index.html | 7 +++++++ src/index.js | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/index.html b/public/index.html index 36a464d0f..80b8fc1ae 100644 --- a/public/index.html +++ b/public/index.html @@ -1,3 +1,10 @@ + diff --git a/src/index.js b/src/index.js index 9b87ed28a..5826ac805 100644 --- a/src/index.js +++ b/src/index.js @@ -4,12 +4,6 @@ import PreRegister from './preregister'; import 'bootstrap/dist/css/bootstrap.css'; import './index.scss'; -console.log(`Hey, you.\n -You’re finally awake.\n -You were trying to see the code, right?\n -Walked right into that hiring message, same as us.\n -If you’d like to work on this website and other cool projects with hackathons, send an email over to engineering@coderit.edu!`); - ReactDOM.render( , document.getElementById('root'), From 0b7b9ba8d27b1795d765a451fb3aa3924bcde5fd Mon Sep 17 00:00:00 2001 From: ww2497 Date: Mon, 24 Aug 2020 19:48:27 -0400 Subject: [PATCH 09/25] Hiring msg. is now an HTML comment & console msg --- public/index.html | 7 ------- src/index.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/public/index.html b/public/index.html index 80b8fc1ae..36a464d0f 100644 --- a/public/index.html +++ b/public/index.html @@ -1,10 +1,3 @@ - diff --git a/src/index.js b/src/index.js index 5826ac805..01c1d9653 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,17 @@ import PreRegister from './preregister'; import 'bootstrap/dist/css/bootstrap.css'; import './index.scss'; +const hiringMessage = `Hey, you. +You’re finally awake. +You were trying to see the code, right? +Walked right into that hiring message, same as us. +If you’d like to work on this website and other cool projects with hackathons, send an email over to engineering@coderit.edu!` + +console.log(hiringMessage); + +const comment = document.createComment("\n"+hiringMessage.toString()+"\n"); +document.insertBefore(comment, document.firstChild); + ReactDOM.render( , document.getElementById('root'), From 63da21843b08536355b57d731c726619e9fed280 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Mon, 24 Aug 2020 19:52:35 -0400 Subject: [PATCH 10/25] COVID-19 headers are no longer vars --- src/covid-popover.js | 2 +- src/nav-bar.js | 2 +- src/preregister.js | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/covid-popover.js b/src/covid-popover.js index dac847206..76ba19fda 100644 --- a/src/covid-popover.js +++ b/src/covid-popover.js @@ -27,7 +27,7 @@ class CovidPopover extends React.Component { placement="top" overlay={ - {this.props.title} + COVID-19 Notice {this.props.content} diff --git a/src/nav-bar.js b/src/nav-bar.js index c73989386..bc297352d 100644 --- a/src/nav-bar.js +++ b/src/nav-bar.js @@ -22,7 +22,7 @@ class NavBar extends React.Component {