Skip to content

Commit

Permalink
BrickHack 7 Site Updates (+hotfix) (#1136)
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>

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>
  • Loading branch information
8 people committed Jan 30, 2021
1 parent e71e9d5 commit 20e1153
Show file tree
Hide file tree
Showing 34 changed files with 41 additions and 31 deletions.
3 changes: 0 additions & 3 deletions assets/back_clip.svg

This file was deleted.

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
3 changes: 0 additions & 3 deletions assets/front_clip.svg

This file was deleted.

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed assets/leadership/og/abhaya.png
Binary file not shown.
Binary file removed assets/leadership/og/kevin.png
Binary file not shown.
Binary file removed assets/leadership/og/makenna.png
Binary file not shown.
Binary file removed assets/leadership/og/mark.png
Binary file not shown.
Binary file removed assets/leadership/og/may.png
Binary file not shown.
Binary file removed assets/leadership/og/michael.png
Diff not rendered.
Binary file removed assets/leadership/og/mira.png
Diff not rendered.
Binary file removed assets/leadership/og/olivia.png
Diff not rendered.
Binary file removed assets/leadership/og/pardeep.jpg
Diff not rendered.
Binary file removed assets/leadership/og/peter.png
Diff not rendered.
27 changes: 14 additions & 13 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
<div id="desk"></div>
<div id="wire"></div>
<div id="lamp-wire"></div>
</div>
<div id="shelf"></div>
</section>
Expand All @@ -75,67 +75,67 @@
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
<div class="slide">
<div class="wire"></div>
<div class="front-clip"></div>
<div class="back-clip"></div>
<img src="./assets/imgs/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
<img src="./assets/carousel/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
</div>
</div>
<div id="modal">
Expand Down Expand Up @@ -164,6 +164,7 @@ <h1>What is a Hackathon?</h1>
<section id="schedule" class="section-pad">
<h1>Schedule</h1>
<p>More events coming soon!</p>
<p>All times are in EST.</p>
<div id="schedule-block">
<div id="schedule-tapes">
<div class="tape"></div>
Expand Down Expand Up @@ -460,7 +461,7 @@ <h2>Partners</h2>
</div>
<div id="prospectus">
<p>Interested in sponsoring BrickHack 7?</p>
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf">prospectus</a> and email us at <a href="mailto:sponsorship@coderit.org">sponsorship@coderit.org</a></p>
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf" target="_blank">prospectus</a> and email us at <a href="mailto:sponsorship@coderit.org">sponsorship@coderit.org</a></p>
</div>
</section>
<footer>
Expand Down
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ new ActiveMenuLink(".navbar-items", options);


// Random hero SVG on each page load
import desk1 from './assets/desk1.svg'
import desk2 from './assets/desk2.svg'
import desk3 from './assets/desk3.svg'
import desk1 from './assets/hero/desk1.svg'
import desk2 from './assets/hero/desk2.svg'
import desk3 from './assets/hero/desk3.svg'

$(document).ready(function() {
var deskIndex = parseInt(localStorage.getItem('deskIndex'));
Expand Down
15 changes: 15 additions & 0 deletions resources/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<title>Redirecting . . . </title>
<meta charset="utf-8"/>
</head>
<body>
<script>
window.onload = function() {
console.log("404");
window.location = "https://brickhack.io";
}
</script>
</body>
</html>
18 changes: 9 additions & 9 deletions sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -228,22 +228,22 @@ nav {
bottom: 0;
z-index: 2;

#desk, #wire {
#desk, #lamp-wire {
position: absolute;
height: 100%;
width: 100%;
background-position: bottom right;
}

#desk {
background-image: url("../assets/desk1.svg");
background-image: url("../assets/hero/desk1.svg");
background-repeat: no-repeat;
z-index: 3;
}

#wire {
#lamp-wire {
background-size: auto;
background-image: url("../assets/wire.svg");
background-image: url("../assets/hero/lamp-wire.svg");
background-repeat: repeat-y;
}
}
Expand All @@ -255,7 +255,7 @@ nav {
left: 0;
right: 0;
bottom: -20px; // Crop SVG slightly
background-image: url("../assets/shelf.svg");
background-image: url("../assets/hero/shelf.svg");
background-repeat: no-repeat;
background-position: bottom center;
background-size: cover;
Expand All @@ -268,7 +268,7 @@ nav {
height: 110%;
width: 900px;
margin-top: -80px;
background-image: url("../assets/shapes.svg");
background-image: url("../assets/hero/shapes.svg");
background-repeat: no-repeat;
background-position: 100% 30%;
background-size: 900px;
Expand Down Expand Up @@ -897,7 +897,7 @@ footer {
right: 0;
bottom: 0;
margin-top: 20px;
background-image: url("../assets/footer.svg");
background-image: url("../assets/footer/footer.svg");
background-repeat: repeat no-repeat;
background-position: bottom center;
background-size: auto 300px;
Expand Down Expand Up @@ -1040,7 +1040,7 @@ footer {
}

#desk-container {
#desk, #wire {
#desk, #lamp-wire {
background-position: calc(100% + 100px) bottom;
}
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ footer {
#desk-container {
right: -100px;

#desk, #wire {
#desk, #lamp-wire {
background-position: right bottom;
}
}
Expand Down

0 comments on commit 20e1153

Please sign in to comment.