Skip to content

Commit 493697b

Browse files
peterkosww2497sjmiller7sjv01180JeremyRudman
authored
BrickHack 7 Upates (#1185)
* More opaque * Changed README badge * turning autoplay back on * Highlighting nav items with scroll (#1064) * Basic nav highlighting * Nav is now hidden on mobile again * Fixed conflicting smooth scrolling settings * Added transparency transition * Adjusted transition target * Adjusted transition target * Added a comment * Update sass/main.scss Co-authored-by: Peter Kos <[email protected]> * Restored old nav structure, adjusted scrolling * Searchbar no longer shows ID, fixed border unaligning nav items * Remove hover on click * Cleaned up CSS, added comment * Removed newline * Update package-lock.json * Update package-lock.json * Target navbar links instead of login button Co-authored-by: Peter Kos <[email protected]> * Bh-970 large screen layout (#1053) * initial commit * deleted swap file, increased nav size along with desk and shape dimensions * mobile section newlines * moved min-breakpoint above * removed extra newline * added spacing for mlh-badge styling * removed needless nav changes and fixed remaining spacing issues * Fix extra newlines Co-authored-by: Peter Kos <[email protected]> * fixed shelf clipping bug on large screen sizes (#1089) changed it to be a percentage over 1500px screen width * Sponsors section (#1088) * Initial sponsor/partner logos * “Inrterested in sponsor” bit * logo updates, added prospectus * Fixed logos, fixed bg color * on hover show color logo; some bugs MLH logo wonky pinnacle no URl * attempt to fix hover delay gltich * Fix partner image size * Update pinnalce link, add sponsors to navbar * Multline sponsors; img size to match amt given * Responsive sponsor section * Exclude transition properly (Refactor l8r) * Hover state on mobile is now handled https://css-tricks.com/solving-sticky-hover-states-with-media-hover-hover/ * Tweak prospectus spacing * Extra newline * Hero section parallax (#1091) * Hero section parallax * Update package-lock.json * Update dependencies * Tweak parallax values for now * Fix zindex on hero content; reorder desk container * Fix shapes div disappearing * Fixed hero text clipping over shelf, disabled mobile parallax * Removed rellax class from the shelf Co-authored-by: Peter Kos <[email protected]> * Carousel image clips over the front clip on mobile on tap/slide (#1078) * Carousel image: removed transparency on hover for smaller screens * Changed hover effect to brightness from opacity * Older iOS can now close image modal * Disabled filter effect on mobile * Increased nav z-index from 4 to 5 Co-authored-by: Peter Kos <[email protected]> * Adding social media summary cards (#1095) * text for cards; still need imgs from design * fixing the example url I left in * removing theme-color meta tag * adding social card image * fixing file paths * fixing twitter * Add parcel-plugin-metaimage * twitter:image property->name Co-authored-by: Peter Kos <[email protected]> * Update shipping FAQ, team size (#1086) * Update shipping FAQ * Remove extra newline * Add team membership limit to faq * Update to logistics wording * Remove extra spaces after some text * Fix hover effect (#1098) * Integrating with FeaturePeek (#1108) * Integrating with FeaturePeek * Fix the newlines * Integrating with FeaturePeek * Fix build script, damn featurepeek * Removes Dokku files/integrations (#1113) * Removes Dokku files/integrations * Update deploy-staging.yml * Update FAQ (#1114) * Add Prizes section (#1117) * Start prizes section * More deisgn + more repsosnive * cleanup * real emdashes * Add wegmans, stickermule (#1120) * making schedule match prizes with border-top (#1122) * new media query for mobile nav (#1123) * stickermule link update (#1129) * adding line about timezone (#1124) Co-authored-by: Peter Kos <[email protected]> * restructuring assets folder (#1126) Co-authored-by: Peter Kos <[email protected]> * Hotfix redirect brickhack.io/apply to apply.brickhack.io (#1135) * Add redirect script Meta redirect is a bit wonky with some browsers so lets try this (GH pages also has no .htaccess) * redirecting all 404s to the main page (not tested) Co-authored-by: sjmiller7 <[email protected]> * Added dynamic schedule (#1139) * Schedule is now pulled from HackathonManager * Schedule is now pulled from HackathonManager * Switched schedule JS to use correct data format * Scaffolded API fetch code * Added date/time background fade * Added time progress indicator * Event marker now extends outside event div * Second-day events can be shown automatically * CSS code style fixes * Event border works for any size events * Fix second day click * More CSS code style fixes * Removed fake API data * fix url for testing * fix now, change url, change section description Co-authored-by: Peter Kos <[email protected]> * update faq (#1143) * Hotfix timezones on schedule (#1147) * Fix timeone schedule * whooops * mtbank->mttech (#1144) * Update ricky hero svgs to use the ones on Notion, adjust color of site (#1138) * changed color and replaced desk files with those on notion * update node and reinstall * another push with the same changes to package-lock * ignore this * updated package-lock for lockfile fix attempt * upgraded npm to fix the package-lock file * need something to push * fservent error fix attempt * update fservent fix * third attempt of fservent update * no warnings on fservent nor lockfile. Please work * fix nit Co-authored-by: Peter Kos <[email protected]> * Schedule dates are shown in local timezone (#1148) * Schedule dates are shown in local timezone * Added timezone message * Update index.html Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> * Adjusted footer, added hover effect on links * Gallery (#1103) * Header and flex box for gallery (#1102) * Remove old gallery * Setup gallery link * header for gallery * images flex box * indentation corrected * resolved issues * changes part 3 lol * resolved issue - favicon and description * resolved css issue * newline & semicolon resolved Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Saranya Dadi <[email protected]> * adding navbar * newline at end of js * fixes and refactoring js * fixes * Update sass/gallery.scss Co-authored-by: Peter Kos <[email protected]> * Update sass/gallery.scss Co-authored-by: Peter Kos <[email protected]> * Gallery Image Popup (#1107) * adding html/css for modal * making the modal open/close * fixing stuff * scss fixes * fixes * fixing the modal * fixes * Gallery Mobile Styling + CSS Cleanup (#1111) * attempt 1 at cliping images * mobile gallery + css cleanup * fixes * Dynamically adding images (#1115) * first bit of changes * attempts at dynamic * FIx IAM credentials * putting image into modal * fixing image loading * comment fix * fixing my comment Co-authored-by: Peter Kos <[email protected]> * trying to add lazy * more attempts at Lazy loading * Revert "more attempts at Lazy loading" This reverts commit a61ba2f. * Revert "trying to add lazy" This reverts commit 22a9145. * Lazy load background images in gallery (#1119) * adding lazy * fixing modal * header information * Dynamic loading + transitions!!!!! * getting the last of the gallery content up Co-authored-by: sjmiller7 <[email protected]> * Gallery thumbnail images and added logos (#1137) * attempts at adding logos * making thumbnails appear * CD/local dev now uses .env for IAM auth; update README w/ local dev instructions (#1132) * Add keys.js generation as part of GH actions Would be ncie to refactor later to chain the build job * switch from keys.js to env var * Update readme to include IAM env settings * Update build to use env var * Remove TODO * Env var CI/CD is now valid YAML :) * Update gallery button w/ new icon + text * fixing ios links issue * Adjusting gallery modal design (#1151) * adjusting modal design * fixing modal scroll breakpoint & dumb padding * Fix package lock sync from backmerge Co-authored-by: SaranyaDadi <[email protected]> Co-authored-by: Saranya Dadi <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: sjmiller7 <[email protected]> * Removed outdated comment * Added event sorting code * Renamed sortEvents to compareEvents * New schedule design with pre-event workshop support (no mobile) (#1160) * Start new schedule; add binder ringz * tabs animation * tabs :) * tabs toggle hell yeah * tab toggling works fully * Schedule contnet layout fixed * Pre-event layout prog; 2 other pages work * Pre events work * color pre event thing * full schedule toggle done * Fix bug * More space on top and fix other bug * fix things * fix js range * no pointer * beeg tabs * Added more sponsor logos (#1164) * Schedule 2.0 Mobile (#1163) * progress on mobile * Progress * Aligning things and fix specifity roadblock * Tab spacing and tweak section on very small screen * style fix * Changed footer hover effect * Fixing gallery modal size and background scrolling (#1169) * the modal is fixed, thanks colby * deleting the inline CSS for overflow on hide * "Show more" buttons share tab colors * Add discord button to hero (#1155) * Add discord button to registration; no mobile * Add discord link * Mobile button progress * More buton * Remove stray comment * Icons now translate on hover rather than turn red * Fix link (#1176) * Revert "Add discord button to hero (#1155)" (#1178) This reverts commit 388700e. # Conflicts: # index.html * Squashed commit of the following: commit 69e6fe176637d12ff95059ee065f3e7689d5135f Author: Peter Kos <[email protected]> Date: Wed Feb 17 15:09:09 2021 -0500 Revert "Add discord button to hero (#1155)" This reverts commit 388700e. # Conflicts: # index.html * Peter made an oopsies (#1181) * Add discord to site (again) (#1184) * Add discord button to registration; no mobile * Add discord link * Mobile button progress * More buton * Remove stray comment * Fix link * Remove comments Co-authored-by: ww2497 <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: William Wu <[email protected]> Co-authored-by: Samuel Velasquez <[email protected]> Co-authored-by: JeremyRudman <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: Chris Baudouin, Jr <[email protected]> Co-authored-by: Colby Gallup <[email protected]> Co-authored-by: SaranyaDadi <[email protected]> Co-authored-by: Saranya Dadi <[email protected]>
1 parent 4df5303 commit 493697b

File tree

2 files changed

+86
-51
lines changed

2 files changed

+86
-51
lines changed

‎index.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@
5858
<!-- Background images due to easier positioning. -->
5959
<div id="hero-text">
6060
<p id="bh7">BRICKHACK 7</p>
61-
<p id="premiere">RIT's Premiere Hackathon</p>
62-
<p id="dates">FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY</p>
63-
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
61+
<p id="dates">FEB 20-21 | RIT DIGITAL HACKATHON</p>
62+
<div id="action-buttons">
63+
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
64+
<a id="discord" href="https://discord.gg/rXapGXsYEK">DISCORD</a>
65+
</div>
6466
</div>
6567
</div>
6668
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
@@ -533,7 +535,8 @@ <h2>contact us</h2>
533535
</div>
534536
<div>
535537
<p>
536-
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct | </a>
538+
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct</a>
539+
|
537540
<a href="https://www.rit.edu/academicaffairs/policiesmanual/c070" target="_blank">privacy policy</a>
538541
</p>
539542
<p>copyright &#169; 2020 codeRIT</p>

‎sass/main.scss

Lines changed: 79 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $title-size: 3em;
4141
text-decoration: none;
4242
user-select: none;
4343
padding: 10px 20px;
44-
border-radius: 50px;
44+
border-radius: 20px;
4545
display: inline-block;
4646
color: white;
4747
cursor: pointer;
@@ -191,28 +191,37 @@ nav {
191191
// This lets the different h elements
192192
// appear to be equally spaced.
193193
line-height: 0.7;
194-
margin-bottom: 30px;
194+
margin-bottom: 40px;
195195
}
196196

197197
#bh7 {
198-
font-size: 5.4em;
198+
font-size: 6em;
199199
font-weight: $font-extrabold;
200200
}
201201

202-
#premiere {
203-
font-size: 2.5em;
204-
font-weight: $font-medium;
205-
}
206-
207202
#dates {
208-
font-size: 1.3em;
209-
font-weight: $font-regular;
203+
font-size: 2em;
204+
font-weight: $font-extrabold;
210205
}
211206

212-
#register {
213-
@include button;
214-
padding: 10px 80px;
215-
font-size: 2em;
207+
#action-buttons {
208+
display: flex;
209+
justify-content: space-between;
210+
width: 80%;
211+
212+
#register, #discord {
213+
@include button;
214+
font-size: 2.3em;
215+
width: 48%;
216+
text-align: center;
217+
}
218+
219+
#discord {
220+
background-color: $dark-blue;
221+
&:hover {
222+
background-color: lighten($dark-blue, 5%);
223+
}
224+
}
216225
}
217226

218227
// Hero Graphics
@@ -1150,6 +1159,7 @@ footer {
11501159
text-align: center;
11511160

11521161
h2 {
1162+
margin-top: -5px;
11531163
margin-bottom: -5px;
11541164
}
11551165

@@ -1162,6 +1172,22 @@ footer {
11621172
font-size: 3em;
11631173
padding: 0px 5px;
11641174
}
1175+
1176+
a {
1177+
display: inline-block;
1178+
transition: 0.2s;
1179+
1180+
&:hover {
1181+
color: $red;
1182+
1183+
i {
1184+
transform: translateY(-4px);
1185+
}
1186+
}
1187+
i {
1188+
transition: 0.2s;
1189+
}
1190+
}
11651191
}
11661192
}
11671193

@@ -1231,18 +1257,6 @@ footer {
12311257
}
12321258

12331259
#hero {
1234-
#bh7 {
1235-
font-size: 6.4em;
1236-
}
1237-
1238-
#premiere {
1239-
font-size: 3em;
1240-
}
1241-
1242-
#dates {
1243-
font-size: 1.6em;
1244-
}
1245-
12461260
#register {
12471261
font-size: 2.3em;
12481262
}
@@ -1271,19 +1285,10 @@ footer {
12711285
}
12721286

12731287
#hero {
1274-
12751288
#bh7 {
12761289
font-size: 5.0em;
12771290
}
12781291

1279-
#premiere {
1280-
font-size: 2.0em;
1281-
}
1282-
1283-
#dates {
1284-
font-size: 1.1em;
1285-
}
1286-
12871292
#shapes {
12881293
right: -100px;
12891294
}
@@ -1384,6 +1389,20 @@ footer {
13841389

13851390
@media screen and (max-width: 1220px) {
13861391

1392+
#hero {
1393+
#dates {
1394+
font-size: 1.5em;
1395+
}
1396+
1397+
#action-buttons {
1398+
width: 70%;
1399+
1400+
#register, #discord {
1401+
font-size: 1.7em;
1402+
}
1403+
}
1404+
}
1405+
13871406
#hackathon #hackathon-content #hackathon-buttons {
13881407
width: 100%;
13891408
}
@@ -1512,16 +1531,20 @@ footer {
15121531
font-size: 4.2em;
15131532
}
15141533

1515-
#premiere {
1516-
font-size: 2.0em;
1534+
#hero-text {
1535+
margin-top: 10vh;
15171536
}
15181537

15191538
#dates {
1520-
font-size: 1.1em;
1539+
font-size: 1.5em;
15211540
}
15221541

1523-
#hero-text {
1524-
margin-top: 10vh;
1542+
#action-buttons {
1543+
width: 60%;
1544+
1545+
#register, #discord {
1546+
font-size: 1.2em;
1547+
}
15251548
}
15261549

15271550
#desk-container {
@@ -1718,18 +1741,23 @@ footer {
17181741

17191742
p {
17201743
line-height: 0.4;
1744+
margin-bottom: 25px;
17211745
}
17221746

17231747
#bh7 {
1724-
font-size: 2.4em;
1748+
font-size: 3em;
17251749
}
17261750

1727-
#premiere {
1728-
font-size: 1.5em;
1751+
#dates {
1752+
font-size: 1em;
17291753
}
17301754

1731-
#dates {
1732-
font-size: 0.7em;
1755+
#action-buttons {
1756+
width: 80%;
1757+
1758+
#register, #discord {
1759+
font-size: 1.2em;
1760+
}
17331761
}
17341762

17351763
#desk-container {
@@ -1817,7 +1845,11 @@ footer {
18171845
background-size: auto 200px;
18181846

18191847
#footer-content {
1820-
height: 160px;
1848+
height: 157px;
1849+
1850+
h2 {
1851+
font-size: 1.2em;
1852+
}
18211853

18221854
p {
18231855
font-size: 0.8em;
@@ -1832,7 +1864,7 @@ footer {
18321864

18331865
@media screen and (max-width: 320px) {
18341866

1835-
#hero #premiere {
1867+
#hero #dates {
18361868
font-size: 1.2em;
18371869
}
18381870
}

0 commit comments

Comments
 (0)