Skip to content

Commit fff778e

Browse files
committed
Merge branch 'develop' into centering
1 parent ccd80a1 commit fff778e

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

src/index.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,6 @@ html, body, #root, #app, .full-height {
178178
max-width: $desktop-width;
179179
text-align: center;
180180
margin: auto;
181-
<<<<<<< HEAD
182-
=======
183-
184-
>>>>>>> develop
185181

186182
@include tablet {
187183
flex-direction: column;

src/preregister.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ class PreRegister extends React.Component {
1414
render() {
1515
return (
1616
<div id="app">
17-
<div className="full-height">
18-
<NavBar
19-
title={desktopNotice}
20-
content={noticeContent}
21-
/>
22-
<div className="section flex-container">
17+
<NavBar
18+
title={desktopNotice}
19+
content={noticeContent}
20+
/>
21+
22+
<div className="section">
23+
<div className="content flex-container">
2324
<div className="left-half">
2425
<div id="hackathon-name">
2526
BRICKHACK 7
@@ -30,21 +31,18 @@ class PreRegister extends React.Component {
3031
<div id="hackathon-info">
3132
Feb 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY
3233
</div>
33-
34-
<img className="hero-img desktop-hide" src={HeroImage} alt="A decorative background hero graphic."/>
35-
34+
<img className="hero-img desktop-hide" src={heroImage} alt={heroImageAlt}/>
3635
<MailchimpInput/>
37-
36+
3837
<div id="contact">
3938
<p>interested in sponsoring?</p>
4039
<p>email <a href="mailto:sponsorship@coderit.org">sponsorship@coderit.org</a></p>
4140
</div>
4241

43-
<CovidPopover
42+
<CovidPopover
4443
title={mobileNotice}
4544
content={noticeContent}
4645
/>
47-
4846
</div>
4947

5048
<div className="right-half mobile-hide">

0 commit comments

Comments
 (0)