From f28516f5cb4f78993205ffa0d6f34fd0f45470f5 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Mon, 21 Dec 2020 19:25:21 -0500 Subject: [PATCH 01/12] More opaque --- sass/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/main.scss b/sass/main.scss index b9f61fce5..5b4e7ffb2 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -118,7 +118,7 @@ p { // Nav nav { - background-color: rgba(#5864a5, 50%); + background-color: rgba(#5864a5, 80%); display: flex; justify-content: space-between; font-size: $nav-fontsize; From 69d37e5be7d54c23a59950d6764be6246cfaebda Mon Sep 17 00:00:00 2001 From: ww2497 Date: Mon, 21 Dec 2020 21:11:40 -0500 Subject: [PATCH 02/12] Changed README badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 204cc65f8..af1e0c3bb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # brickhack.io -[![Build Status](https://travis-ci.com/codeRIT/brickhack.io.svg?branch=develop)](https://travis-ci.com/codeRIT/brickhack.io) +![Build](https://github.com/codeRIT/brickhack.io/workflows/Build/badge.svg) The public facing website for BrickHack. From 583b5301bd3ff6fab0bb3825cd3341d9b1164cff Mon Sep 17 00:00:00 2001 From: sjmiller7 Date: Sat, 2 Jan 2021 21:40:23 -0500 Subject: [PATCH 03/12] turning autoplay back on --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 603de0253..71b130a62 100644 --- a/index.js +++ b/index.js @@ -45,7 +45,7 @@ $(document).ready(function() { slidesToShow: 3, slidesToScroll: 2, cssEase: 'ease-in-out', - autoplay: false, + autoplay: true, autoplaySpeed: 2000, speed: 1000, responsive: [ From abb6aa6d9c3209a5170be02365d40d7a8a5bea65 Mon Sep 17 00:00:00 2001 From: William Wu <31863372+ww2497@users.noreply.github.com> Date: Mon, 4 Jan 2021 20:55:27 -0500 Subject: [PATCH 04/12] 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 * 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 --- index.html | 6 +- index.js | 14 + package-lock.json | 2655 ++++++++++++++++++++++++++++----------------- package.json | 5 +- sass/main.scss | 18 +- 5 files changed, 1699 insertions(+), 999 deletions(-) diff --git a/index.html b/index.html index 64fd2acd1..05b0137a5 100644 --- a/index.html +++ b/index.html @@ -26,13 +26,13 @@
-
-
-
-
-
-
-
+
+

BRICKHACK 7

@@ -59,6 +54,11 @@ REGISTER
+
+
+
+
+
@@ -312,10 +313,13 @@

Frequently Asked Questions

-

We are still evaluating which regions we can ship to. Stay tuned!

+

Everyone is eligible to receive digital swag and digital prizes.

+

If your shipping address is in the United States, we are shipping physical swag and prizes.

+

If your shipping address is in Canada, we are shipping physical prizes.

+

If your shipping address is outside of the United States and Canada, we are unable to ship physical swag and prizes.

From 8b7dd509742fdbbf146fa6322fe927e6646bc9f3 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Thu, 7 Jan 2021 23:42:20 -0500 Subject: [PATCH 12/12] Fix hover effect (#1098) --- sass/main.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sass/main.scss b/sass/main.scss index 7d5371961..21d4151ab 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -76,10 +76,10 @@ $event-count: 6; font-family: "Poppins", sans-serif; color: white; // Transition all elements on the screen - // (except FAQ panel, which already has a transition, - // and the section days, which need no transition.) - &:not(.link):not(.panel):not(#days):not(.number):not(#desk):not(#wire):not(.rellax):not(.logo img) { - transition: all 1s ease; + // (except FAQ panel, which has conflicting transitions) + &:not(.panel) { + transition-duration: 1s; + transition-property: margin, padding, width, font-size; } }