Skip to content

Commit

Permalink
BrickHack 7 Upates (#1185)
Browse files Browse the repository at this point in the history 
* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* restructuring assets folder (#1126)

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <sj.miller.tn@gmail.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>
Co-authored-by: Saranya Dadi <sd1259@rit.edu>

* adding navbar

* newline at end of js

* fixes and refactoring js

* fixes

* Update sass/gallery.scss

Co-authored-by: Peter Kos <pkos91@icloud.com>

* Update sass/gallery.scss

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <sj.miller.tn@gmail.com>

* 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 <71734141+SaranyaDadi@users.noreply.github.com>
Co-authored-by: Saranya Dadi <sd1259@rit.edu>
Co-authored-by: sjmiller7 <sj.miller.tn@gmail.com>
Co-authored-by: sjmiller7 <56453920+sjmiller7@users.noreply.github.com>

* 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 <pkos91@icloud.com>
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 <ww2497@rit.edu>
Co-authored-by: sjmiller7 <sj.miller.tn@gmail.com>
Co-authored-by: William Wu <31863372+ww2497@users.noreply.github.com>
Co-authored-by: Samuel Velasquez <46058951+sjv01180@users.noreply.github.com>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
Co-authored-by: sjmiller7 <56453920+sjmiller7@users.noreply.github.com>
Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
Co-authored-by: Colby Gallup <colbygallup@gmail.com>
Co-authored-by: SaranyaDadi <71734141+SaranyaDadi@users.noreply.github.com>
Co-authored-by: Saranya Dadi <sd1259@rit.edu>
  • Loading branch information
@peterkos @ww2497
@sjmiller7 @sjv01180 @JeremyRudman @cbaudouinjr @SaranyaDadi @sd1259
11 people committed Feb 19, 2021
1 parent 4df5303 commit 493697b
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 51 deletions.
11 changes: 7 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@
<!-- Background images due to easier positioning. -->
<div id="hero-text">
<p id="bh7">BRICKHACK 7</p>
<p id="premiere">RIT's Premiere Hackathon</p>
<p id="dates">FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY</p>
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
<p id="dates">FEB 20-21 | RIT DIGITAL HACKATHON</p>
<div id="action-buttons">
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
<a id="discord" href="https://discord.gg/rXapGXsYEK">DISCORD</a>
</div>
</div>
</div>
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
Expand Down Expand Up @@ -533,7 +535,8 @@ <h2>contact us</h2>
</div>
<div>
<p>
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct | </a>
<a href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">code of conduct</a>
|
<a href="https://www.rit.edu/academicaffairs/policiesmanual/c070" target="_blank">privacy policy</a>
</p>
<p>copyright &#169; 2020 codeRIT</p>
Expand Down
126 changes: 79 additions & 47 deletions sass/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $title-size: 3em;
text-decoration: none;
user-select: none;
padding: 10px 20px;
border-radius: 50px;
border-radius: 20px;
display: inline-block;
color: white;
cursor: pointer;
Expand Down Expand Up @@ -191,28 +191,37 @@ nav {
// This lets the different h elements
// appear to be equally spaced.
line-height: 0.7;
margin-bottom: 30px;
margin-bottom: 40px;
}

#bh7 {
font-size: 5.4em;
font-size: 6em;
font-weight: $font-extrabold;
}

#premiere {
font-size: 2.5em;
font-weight: $font-medium;
}

#dates {
font-size: 1.3em;
font-weight: $font-regular;
font-size: 2em;
font-weight: $font-extrabold;
}

#register {
@include button;
padding: 10px 80px;
font-size: 2em;
#action-buttons {
display: flex;
justify-content: space-between;
width: 80%;

#register, #discord {
@include button;
font-size: 2.3em;
width: 48%;
text-align: center;
}

#discord {
background-color: $dark-blue;
&:hover {
background-color: lighten($dark-blue, 5%);
}
}
}

// Hero Graphics
Expand Down Expand Up @@ -1150,6 +1159,7 @@ footer {
text-align: center;

h2 {
margin-top: -5px;
margin-bottom: -5px;
}

Expand All @@ -1162,6 +1172,22 @@ footer {
font-size: 3em;
padding: 0px 5px;
}

a {
display: inline-block;
transition: 0.2s;

&:hover {
color: $red;

i {
transform: translateY(-4px);
}
}
i {
transition: 0.2s;
}
}
}
}

Expand Down Expand Up @@ -1231,18 +1257,6 @@ footer {
}

#hero {
#bh7 {
font-size: 6.4em;
}

#premiere {
font-size: 3em;
}

#dates {
font-size: 1.6em;
}

#register {
font-size: 2.3em;
}
Expand Down Expand Up @@ -1271,19 +1285,10 @@ footer {
}

#hero {

#bh7 {
font-size: 5.0em;
}

#premiere {
font-size: 2.0em;
}

#dates {
font-size: 1.1em;
}

#shapes {
right: -100px;
}
Expand Down Expand Up @@ -1384,6 +1389,20 @@ footer {

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

#hero {
#dates {
font-size: 1.5em;
}

#action-buttons {
width: 70%;

#register, #discord {
font-size: 1.7em;
}
}
}

#hackathon #hackathon-content #hackathon-buttons {
width: 100%;
}
Expand Down Expand Up @@ -1512,16 +1531,20 @@ footer {
font-size: 4.2em;
}

#premiere {
font-size: 2.0em;
#hero-text {
margin-top: 10vh;
}

#dates {
font-size: 1.1em;
font-size: 1.5em;
}

#hero-text {
margin-top: 10vh;
#action-buttons {
width: 60%;

#register, #discord {
font-size: 1.2em;
}
}

#desk-container {
Expand Down Expand Up @@ -1718,18 +1741,23 @@ footer {

p {
line-height: 0.4;
margin-bottom: 25px;
}

#bh7 {
font-size: 2.4em;
font-size: 3em;
}

#premiere {
font-size: 1.5em;
#dates {
font-size: 1em;
}

#dates {
font-size: 0.7em;
#action-buttons {
width: 80%;

#register, #discord {
font-size: 1.2em;
}
}

#desk-container {
Expand Down Expand Up @@ -1817,7 +1845,11 @@ footer {
background-size: auto 200px;

#footer-content {
height: 160px;
height: 157px;

h2 {
font-size: 1.2em;
}

p {
font-size: 0.8em;
Expand All @@ -1832,7 +1864,7 @@ footer {

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

#hero #premiere {
#hero #dates {
font-size: 1.2em;
}
}

0 comments on commit 493697b

Please sign in to comment.