Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$blue: #465491;

/*
/*
tablet & mobile have the column layout
tablet has fixed widths and font sizes
mobile has scaling widths and font sizes
Expand Down Expand Up @@ -67,7 +67,7 @@ html, body, #root, #app, .full-height {
width: 100%;

padding: 12px 0px;

font-size: 14px;
font-weight: 300;
text-align: center;
Expand All @@ -88,7 +88,7 @@ html, body, #root, #app, .full-height {
height: 150px;
margin-left: 40px;
}

@include mobile {
/*68 px is the current height of the nav bar
will think of a better way to structure this later*/
Expand All @@ -105,13 +105,13 @@ html, body, #root, #app, .full-height {

font-size: 15px;
font-weight: 500;

color: $blue;

ul {
list-style-type: none;
float: right;

margin: 0;
padding: 0;

Expand All @@ -122,7 +122,7 @@ html, body, #root, #app, .full-height {

a {
color: $blue;

border-bottom-style: solid;
border-color: transparentize($blue, 1);
transition: border-color 0.2s;
Expand Down Expand Up @@ -173,7 +173,7 @@ html, body, #root, #app, .full-height {
max-width: 1100px;
text-align: center;
margin: auto;


@include tablet {
flex-direction: column;
Expand All @@ -199,7 +199,7 @@ html, body, #root, #app, .full-height {
}

/*
note: development on a mac may not have all font-weights,
note: development on a mac may not have all font-weights,
lines of text may be wider than they appear
*/
#hackathon-name {
Expand Down Expand Up @@ -232,7 +232,7 @@ lines of text may be wider than they appear

@include mobile {
height: 4vw;
font-size: 3.2vw;
font-size: 3.2vw;
}
}

Expand All @@ -241,8 +241,9 @@ lines of text may be wider than they appear
width: 375px;
margin: auto;

margin-top: 10px;

margin-top: 20px;
margin-bottom: 20px;

border-style: solid;
border-width: 1px;
border-color: $blue;
Expand Down Expand Up @@ -308,7 +309,7 @@ lines of text may be wider than they appear
background-position: 5.25px;
}
}

@include mobile {
height: 9vw;
width: 9vw;
Expand Down Expand Up @@ -336,3 +337,10 @@ lines of text may be wider than they appear
font-weight: 500;
}
}

#contact {

p {
margin: 0;
}
}
17 changes: 11 additions & 6 deletions src/preregister.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class PreRegister extends React.Component {
return (
<div id="app">
<div className="full-height">
<NavBar
<NavBar
title={desktopNotice}
content={noticeContent}
/>
Expand All @@ -25,20 +25,25 @@ class PreRegister extends React.Component {
</div>
<div id="hackathon-description">
RIT's Premiere Hackathon
</div>
</div>
<div id="hackathon-info">
Feb 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY
</div>

<img className="hero-img desktop-hide" src={HeroImage} alt="A decorative background hero graphic."/>

<MailchimpInput/>

<CovidPopover
<div id="contact" className="mobile-hide">
<p>interested in sponsoring?</p>
<p>email <a href="mailto:sponsorship@coderit.org">sponsorship@coderit.org</a></p>
</div>

<CovidPopover
title={mobileNotice}
content={noticeContent}
/>

</div>

<div className="right-half mobile-hide">
Expand Down