Skip to content

Commit ee6ff69

Browse files
peterkosww2497sjmiller7sjv01180JeremyRudman
authored
BrickHack 7 Site Updates (+hotfix) (#1136)
* 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]> 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]>
1 parent e363e59 commit ee6ff69

34 files changed

+41
-31
lines changed

assets/back_clip.svg

-3
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.

assets/front_clip.svg

-3
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.

assets/leadership/og/abhaya.png

-681 KB
Binary file not shown.

assets/leadership/og/kevin.png

-995 KB
Binary file not shown.

assets/leadership/og/makenna.png

-951 KB
Binary file not shown.

assets/leadership/og/mark.png

-865 KB
Binary file not shown.

assets/leadership/og/may.png

-805 KB
Binary file not shown.

assets/leadership/og/michael.png

-509 KB
Binary file not shown.

assets/leadership/og/mira.png

-999 KB
Binary file not shown.

assets/leadership/og/olivia.png

-664 KB
Binary file not shown.

assets/leadership/og/pardeep.jpg

-504 KB
Binary file not shown.

assets/leadership/og/peter.png

-1.01 MB
Binary file not shown.

index.html

+14-13
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</div>
6666
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
6767
<div id="desk"></div>
68-
<div id="wire"></div>
68+
<div id="lamp-wire"></div>
6969
</div>
7070
<div id="shelf"></div>
7171
</section>
@@ -75,67 +75,67 @@
7575
<div class="wire"></div>
7676
<div class="front-clip"></div>
7777
<div class="back-clip"></div>
78-
<img src="./assets/imgs/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
78+
<img src="./assets/carousel/1.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
7979
</div>
8080
<div class="slide">
8181
<div class="wire"></div>
8282
<div class="front-clip"></div>
8383
<div class="back-clip"></div>
84-
<img src="./assets/imgs/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
84+
<img src="./assets/carousel/2.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
8585
</div>
8686
<div class="slide">
8787
<div class="wire"></div>
8888
<div class="front-clip"></div>
8989
<div class="back-clip"></div>
90-
<img src="./assets/imgs/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
90+
<img src="./assets/carousel/3.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
9191
</div>
9292
<div class="slide">
9393
<div class="wire"></div>
9494
<div class="front-clip"></div>
9595
<div class="back-clip"></div>
96-
<img src="./assets/imgs/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
96+
<img src="./assets/carousel/4.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
9797
</div>
9898
<div class="slide">
9999
<div class="wire"></div>
100100
<div class="front-clip"></div>
101101
<div class="back-clip"></div>
102-
<img src="./assets/imgs/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
102+
<img src="./assets/carousel/5.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
103103
</div>
104104
<div class="slide">
105105
<div class="wire"></div>
106106
<div class="front-clip"></div>
107107
<div class="back-clip"></div>
108-
<img src="./assets/imgs/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
108+
<img src="./assets/carousel/6.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
109109
</div>
110110
<div class="slide">
111111
<div class="wire"></div>
112112
<div class="front-clip"></div>
113113
<div class="back-clip"></div>
114-
<img src="./assets/imgs/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
114+
<img src="./assets/carousel/7.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
115115
</div>
116116
<div class="slide">
117117
<div class="wire"></div>
118118
<div class="front-clip"></div>
119119
<div class="back-clip"></div>
120-
<img src="./assets/imgs/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
120+
<img src="./assets/carousel/8.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
121121
</div>
122122
<div class="slide">
123123
<div class="wire"></div>
124124
<div class="front-clip"></div>
125125
<div class="back-clip"></div>
126-
<img src="./assets/imgs/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
126+
<img src="./assets/carousel/9.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
127127
</div>
128128
<div class="slide">
129129
<div class="wire"></div>
130130
<div class="front-clip"></div>
131131
<div class="back-clip"></div>
132-
<img src="./assets/imgs/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
132+
<img src="./assets/carousel/10.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
133133
</div>
134134
<div class="slide">
135135
<div class="wire"></div>
136136
<div class="front-clip"></div>
137137
<div class="back-clip"></div>
138-
<img src="./assets/imgs/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
138+
<img src="./assets/carousel/11.jpg" class="slide-image" alt="BrickHack 6 attendees"/>
139139
</div>
140140
</div>
141141
<div id="modal">
@@ -164,6 +164,7 @@ <h1>What is a Hackathon?</h1>
164164
<section id="schedule" class="section-pad">
165165
<h1>Schedule</h1>
166166
<p>More events coming soon!</p>
167+
<p>All times are in EST.</p>
167168
<div id="schedule-block">
168169
<div id="schedule-tapes">
169170
<div class="tape"></div>
@@ -460,7 +461,7 @@ <h2>Partners</h2>
460461
</div>
461462
<div id="prospectus">
462463
<p>Interested in sponsoring BrickHack 7?</p>
463-
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf">prospectus</a> and email us at <a href="mailto:[email protected]">[email protected]</a></p>
464+
<p>View our <a href="./assets/sponsors/BrickHack 7 Prospectus.pdf" target="_blank">prospectus</a> and email us at <a href="mailto:[email protected]">[email protected]</a></p>
464465
</div>
465466
</section>
466467
<footer>

index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ new ActiveMenuLink(".navbar-items", options);
3131

3232

3333
// Random hero SVG on each page load
34-
import desk1 from './assets/desk1.svg'
35-
import desk2 from './assets/desk2.svg'
36-
import desk3 from './assets/desk3.svg'
34+
import desk1 from './assets/hero/desk1.svg'
35+
import desk2 from './assets/hero/desk2.svg'
36+
import desk3 from './assets/hero/desk3.svg'
3737

3838
$(document).ready(function() {
3939
var deskIndex = parseInt(localStorage.getItem('deskIndex'));

resources/404.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Redirecting . . . </title>
5+
<meta charset="utf-8"/>
6+
</head>
7+
<body>
8+
<script>
9+
window.onload = function() {
10+
console.log("404");
11+
window.location = "https://brickhack.io";
12+
}
13+
</script>
14+
</body>
15+
</html>

sass/main.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -228,22 +228,22 @@ nav {
228228
bottom: 0;
229229
z-index: 2;
230230

231-
#desk, #wire {
231+
#desk, #lamp-wire {
232232
position: absolute;
233233
height: 100%;
234234
width: 100%;
235235
background-position: bottom right;
236236
}
237237

238238
#desk {
239-
background-image: url("../assets/desk1.svg");
239+
background-image: url("../assets/hero/desk1.svg");
240240
background-repeat: no-repeat;
241241
z-index: 3;
242242
}
243243

244-
#wire {
244+
#lamp-wire {
245245
background-size: auto;
246-
background-image: url("../assets/wire.svg");
246+
background-image: url("../assets/hero/lamp-wire.svg");
247247
background-repeat: repeat-y;
248248
}
249249
}
@@ -255,7 +255,7 @@ nav {
255255
left: 0;
256256
right: 0;
257257
bottom: -20px; // Crop SVG slightly
258-
background-image: url("../assets/shelf.svg");
258+
background-image: url("../assets/hero/shelf.svg");
259259
background-repeat: no-repeat;
260260
background-position: bottom center;
261261
background-size: cover;
@@ -268,7 +268,7 @@ nav {
268268
height: 110%;
269269
width: 900px;
270270
margin-top: -80px;
271-
background-image: url("../assets/shapes.svg");
271+
background-image: url("../assets/hero/shapes.svg");
272272
background-repeat: no-repeat;
273273
background-position: 100% 30%;
274274
background-size: 900px;
@@ -897,7 +897,7 @@ footer {
897897
right: 0;
898898
bottom: 0;
899899
margin-top: 20px;
900-
background-image: url("../assets/footer.svg");
900+
background-image: url("../assets/footer/footer.svg");
901901
background-repeat: repeat no-repeat;
902902
background-position: bottom center;
903903
background-size: auto 300px;
@@ -1040,7 +1040,7 @@ footer {
10401040
}
10411041

10421042
#desk-container {
1043-
#desk, #wire {
1043+
#desk, #lamp-wire {
10441044
background-position: calc(100% + 100px) bottom;
10451045
}
10461046
}
@@ -1143,7 +1143,7 @@ footer {
11431143
#desk-container {
11441144
right: -100px;
11451145

1146-
#desk, #wire {
1146+
#desk, #lamp-wire {
11471147
background-position: right bottom;
11481148
}
11491149
}

0 commit comments

Comments
 (0)