diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 6071475a7..d9839ec8d 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -1,20 +1,20 @@ -name: Deploy - Staging +# Deploys a preview page for each PR on FeaturePeek -on: - push: - branches: - - develop +name: Deploy - Staging +on: push jobs: - deploy-staging: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Use node 12.x + uses: actions/setup-node@v1 with: - ref: develop - - name: Push to Staging - uses: dokku/github-action@master - with: - git_push_flags: '--force' - git_remote_url: 'ssh://dokku@csh-cloud.oweb.co:22/brickhack-stage' - ssh_private_key: ${{ secrets.CODERIT_CLOUD_SSH_PRIVATE_KEY }} + node-version: 12.x + - name: Install dependencies + run: npm install + - name: Build + run: npm run build + - name: Ping FeaturePeek + run: bash <(curl -s https://peek.run/ci) diff --git a/assets/prizes/rickyconfetti.svg b/assets/prizes/rickyconfetti.svg new file mode 100644 index 000000000..af1ce233e --- /dev/null +++ b/assets/prizes/rickyconfetti.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/sponsors/logos/stickermule-white.svg b/assets/sponsors/logos/stickermule-white.svg new file mode 100644 index 000000000..7279425f2 --- /dev/null +++ b/assets/sponsors/logos/stickermule-white.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/sponsors/logos/stickermule.svg b/assets/sponsors/logos/stickermule.svg new file mode 100644 index 000000000..bf2556c50 --- /dev/null +++ b/assets/sponsors/logos/stickermule.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/sponsors/logos/wegmans-white.svg b/assets/sponsors/logos/wegmans-white.svg new file mode 100644 index 000000000..28b1b2796 --- /dev/null +++ b/assets/sponsors/logos/wegmans-white.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/assets/sponsors/logos/wegmans.svg b/assets/sponsors/logos/wegmans.svg new file mode 100644 index 000000000..1f81c97d2 --- /dev/null +++ b/assets/sponsors/logos/wegmans.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/buildpack-run.sh b/buildpack-run.sh deleted file mode 100644 index 2249a84b9..000000000 --- a/buildpack-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Runs build script so heroku-buildpack-static -# has a freshly compiled static site to work with. -rm -r build -npm install -npm run build diff --git a/index.html b/index.html index 69ecafe59..c43febea5 100644 --- a/index.html +++ b/index.html @@ -40,6 +40,7 @@ GENERAL SCHEDULE + PRIZES FAQ ABOUT US SPONSORS @@ -218,6 +219,28 @@
SUNDAY
+
+

Prizes

+
+
+ Confetti Ricky the Brick +
+
+
+

Despite going digital, you can still win prizes at BrickHack!

+
+
+

This year, we'll have more than 10 prize categories for you to compete in — more info to come on Devpost.

+
+
+

We'll have physical prizes shipped out to United States and Canada residents, while digital prizes are open game for everybody!

+
+
+

Check out our FAQ for more details.

+
+
+
+

Frequently Asked Questions

@@ -297,7 +320,7 @@

Frequently Asked Questions

Soon!

-

(We'll send an email out if you are accepted.)

+

Every application is considered on a first-come, first-serve basis. So register early! We'll send an email out if you're accepted.

@@ -413,6 +436,9 @@

Sponsors

+

Interested in sponsoring BrickHack 7?

diff --git a/peek.yml b/peek.yml new file mode 100644 index 000000000..864b7fbeb --- /dev/null +++ b/peek.yml @@ -0,0 +1,5 @@ +version: 2 +main: + type: static + path: /build + spa: false \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index 21d4151ab..cef6c5509 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -514,6 +514,65 @@ nav { } } +#prizes { + h1 { + font-size: $title-size; + margin-bottom: 40px; + } + + #prizes-wrapper { + display: flex; + justify-content: space-between; + align-content: center; + max-width: 1600px; + margin: 0 auto; + + #ricky-confetti { + align-self: flex-end; + width: 30%; + + img { + max-height: 100%; + display: block; + margin: 0 auto; + } + } + + #prizes-container { + width: 70%; + display: flex; + flex-direction: column; + justify-content: space-between; + padding-left: 40px; + + .prize { + background-color: white; + padding: 35px; + border-radius: $img-border-radius; + margin-bottom: 30px; + + &:last-child { + margin-bottom: 0; + } + + // Sequentially assign colors to all elements + $colors: $light-gray, $orange; + @for $i from 1 through 4 { + &:nth-child(#{$i}) { + border-top: 10px solid nth($colors, $i % length($colors) + 1); + } + } + + p, strong { + color: $blue; + } + } + } + } + + +} + #faq { background-color: $dark-blue; #faq-wrapper { @@ -660,6 +719,7 @@ nav { user-select: none; cursor: pointer; color: white; + .day { .number { font-size: 6.5em; @@ -688,7 +748,7 @@ nav { $colors: $red, $orange, $light-gray; @for $i from 1 through $event-count { .event:nth-child(#{$i}) { - border-left: 30px solid nth($colors, $i % length($colors) + 1); + border-top: 10px solid nth($colors, $i % length($colors) + 1); } } @@ -892,6 +952,10 @@ footer { background-image: url("/assets/sponsors/logos/mtbank.svg"); } + .wegmans:hover { + background-image: url("/assets/sponsors/logos/wegmans.svg"); + } + .readme:hover { background-image: url("/assets/sponsors/logos/readme.svg"); } @@ -903,6 +967,10 @@ footer { .mlh:hover { background-image: url("/assets/sponsors/logos/mlh.svg"); } + + .stickermule:hover { + background-image: url("/assets/sponsors/logos/stickermule.svg"); + } } } @@ -1086,6 +1154,18 @@ footer { justify-content: space-between; } + #prizes #prizes-wrapper { + #prizes-container { + .prize { + padding: 20px; + + p, strong { + font-size: 1em; + } + } + } + } + #sponsors { #sponsor-grid, #partner-grid { flex-wrap: wrap; @@ -1117,11 +1197,38 @@ footer { } } -@media screen and (max-width: 900px) { +@media screen and (max-width: 955px) { // Redefine only for mobile $nav-height: 60px; + nav { + height: $nav-height; + position: absolute; + + #logo img { + width: $nav-height; + height: $nav-height; + } + + #mlh-badge { + width: 90px; + } + + .link { + display: none; + } + + #login { + padding: 8px 30px; + margin: 0; + font-size: 0.8em; + } + } +} + +@media screen and (max-width: 900px) { + h1, section > p { text-align: center; } @@ -1146,23 +1253,6 @@ footer { padding: 20px; } - nav { - height: $nav-height; - position: absolute; - - #logo img { - width: $nav-height; - height: $nav-height; - } - - #mlh-badge { - width: 90px; - } - - .link { - display: none; - } - } #hero { #hero-content { @@ -1295,6 +1385,25 @@ footer { } } + #prizes #prizes-wrapper { + flex-direction: column; + max-height: 100%; + + #ricky-confetti { + width: 55%; + margin: 0 auto; + } + + #prizes-container { + width: 100%; + padding-left: 0; + margin-top: 30px; + .prize { + margin-bottom: 20px; + } + } + } + #faq #faq-wrapper { h1 { @@ -1341,12 +1450,6 @@ footer { padding: 20px; } - nav #login { - padding: 8px 30px; - margin: 0; - font-size: 0.8em; - } - #hero { p { @@ -1412,6 +1515,10 @@ footer { } } + #prizes #prizes-wrapper #ricky-confetti { + width: 65%; + } + #leadership #leaders { grid-template-columns: repeat(2, $leadership-size-mobile-sm);