Skip to content

Commit 38e191f

Browse files
peterkosww2497sjmiller7sjv01180JeremyRudman
authored
BrickHack 7 Updates (#1179)
* 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]> * 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 * 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 * Fix link (#1176) * Revert "Add discord button to hero (#1155)" (#1178) This reverts commit 04d555d. # Conflicts: # index.html * Squashed commit of the following: commit d1fd38f Author: Peter Kos <[email protected]> Date: Wed Feb 17 15:09:09 2021 -0500 Revert "Add discord button to hero (#1155)" This reverts commit 04d555d. # Conflicts: # index.html 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 531c676 commit 38e191f

File tree

2 files changed

+48
-65
lines changed

2 files changed

+48
-65
lines changed

index.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@
5858
<!-- Background images due to easier positioning. -->
5959
<div id="hero-text">
6060
<p id="bh7">BRICKHACK 7</p>
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>
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>
6664
</div>
6765
</div>
6866
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">

sass/main.scss

Lines changed: 45 additions & 60 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: 20px;
44+
border-radius: 50px;
4545
display: inline-block;
4646
color: white;
4747
cursor: pointer;
@@ -191,37 +191,28 @@ nav {
191191
// This lets the different h elements
192192
// appear to be equally spaced.
193193
line-height: 0.7;
194-
margin-bottom: 40px;
194+
margin-bottom: 30px;
195195
}
196196

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

202-
#dates {
203-
font-size: 2em;
204-
font-weight: $font-extrabold;
202+
#premiere {
203+
font-size: 2.5em;
204+
font-weight: $font-medium;
205205
}
206206

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-
}
207+
#dates {
208+
font-size: 1.3em;
209+
font-weight: $font-regular;
210+
}
218211

219-
#discord {
220-
background-color: $dark-blue;
221-
&:hover {
222-
background-color: lighten($dark-blue, 5%);
223-
}
224-
}
212+
#register {
213+
@include button;
214+
padding: 10px 80px;
215+
font-size: 2em;
225216
}
226217

227218
// Hero Graphics
@@ -1249,6 +1240,18 @@ footer {
12491240
}
12501241

12511242
#hero {
1243+
#bh7 {
1244+
font-size: 6.4em;
1245+
}
1246+
1247+
#premiere {
1248+
font-size: 3em;
1249+
}
1250+
1251+
#dates {
1252+
font-size: 1.6em;
1253+
}
1254+
12521255
#register {
12531256
font-size: 2.3em;
12541257
}
@@ -1277,13 +1280,18 @@ footer {
12771280
}
12781281

12791282
#hero {
1283+
12801284
#bh7 {
12811285
font-size: 5.0em;
12821286
}
12831287

1284-
// #dates {
1285-
// font-size: 1.7em;
1286-
// }
1288+
#premiere {
1289+
font-size: 2.0em;
1290+
}
1291+
1292+
#dates {
1293+
font-size: 1.1em;
1294+
}
12871295

12881296
#shapes {
12891297
right: -100px;
@@ -1385,20 +1393,6 @@ footer {
13851393

13861394
@media screen and (max-width: 1220px) {
13871395

1388-
#hero {
1389-
#dates {
1390-
font-size: 1.5em;
1391-
}
1392-
1393-
#action-buttons {
1394-
width: 70%;
1395-
1396-
#register, #discord {
1397-
font-size: 1.7em;
1398-
}
1399-
}
1400-
}
1401-
14021396
#hackathon #hackathon-content #hackathon-buttons {
14031397
width: 100%;
14041398
}
@@ -1527,20 +1521,16 @@ footer {
15271521
font-size: 4.2em;
15281522
}
15291523

1530-
#hero-text {
1531-
margin-top: 10vh;
1524+
#premiere {
1525+
font-size: 2.0em;
15321526
}
15331527

15341528
#dates {
1535-
font-size: 1.5em;
1529+
font-size: 1.1em;
15361530
}
15371531

1538-
#action-buttons {
1539-
width: 60%;
1540-
1541-
#register, #discord {
1542-
font-size: 1.2em;
1543-
}
1532+
#hero-text {
1533+
margin-top: 10vh;
15441534
}
15451535

15461536
#desk-container {
@@ -1737,23 +1727,18 @@ footer {
17371727

17381728
p {
17391729
line-height: 0.4;
1740-
margin-bottom: 25px;
17411730
}
17421731

17431732
#bh7 {
1744-
font-size: 3em;
1733+
font-size: 2.4em;
17451734
}
17461735

1747-
#dates {
1748-
font-size: 1em;
1736+
#premiere {
1737+
font-size: 1.5em;
17491738
}
17501739

1751-
#action-buttons {
1752-
width: 80%;
1753-
1754-
#register, #discord {
1755-
font-size: 1.2em;
1756-
}
1740+
#dates {
1741+
font-size: 0.7em;
17571742
}
17581743

17591744
#desk-container {
@@ -1856,7 +1841,7 @@ footer {
18561841

18571842
@media screen and (max-width: 320px) {
18581843

1859-
#hero #dates {
1844+
#hero #premiere {
18601845
font-size: 1.2em;
18611846
}
18621847
}

0 commit comments

Comments
 (0)