From 1a5517b550c6404a6a29631c7cdcdb30061debc6 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Fri, 11 Dec 2020 01:10:15 -0500 Subject: [PATCH 1/3] Fix width of general cols to be 60/40 Signed-off-by: Peter Kos --- sass/main.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sass/main.scss b/sass/main.scss index 957619939..fe168c6cb 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -335,8 +335,8 @@ nav { padding: $section-padding; align-items: center; - div { - width: 40%; + #hackathon-text { + width: 60%; } } @@ -344,8 +344,7 @@ nav { @include button; background-color: $light-blue; display: inline-block; - width: auto; - height: auto; + margin: 0 auto; padding: 30px; border-radius: 20px; From 5de974bed573d616ac91ac320b60f795b46b732c Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Fri, 11 Dec 2020 01:14:17 -0500 Subject: [PATCH 2/3] Fix button link thing Signed-off-by: Peter Kos --- index.html | 10 ++++++---- sass/main.scss | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 6f160efb2..1c44e7681 100644 --- a/index.html +++ b/index.html @@ -131,10 +131,12 @@

What is a Hackathon?

Students work in teams and mentors are present to offer help. Sponsors attend to help, recruit, and promote their products. Teams compete in different categories and prizes are awarded, but everyone learns and everyone wins!

Come spend 24 hours with us at BrickHack and dedicate time to learn, collaborate, build, and innovate.

- + +
+ +

Visit Major League Hacking (MLH)

+
+
diff --git a/sass/main.scss b/sass/main.scss index fe168c6cb..0e5cc83fb 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -343,7 +343,6 @@ nav { #mlh { @include button; background-color: $light-blue; - display: inline-block; margin: 0 auto; padding: 30px; border-radius: 20px; @@ -352,7 +351,11 @@ nav { background-color: lighten($light-blue, 5%); } - a { + i, p { + display: inline; + } + + p { font-size: 1.2em; font-weight: $font-medium; } @@ -362,6 +365,7 @@ nav { font-size: 1.6em; color: $red; vertical-align: text-bottom; + padding-right: 10px; } } } From 08fdc2d881013d1554132b83eba6dadd1b160665 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Fri, 11 Dec 2020 01:37:24 -0500 Subject: [PATCH 3/3] Factor button effect out for (most) place exc card Signed-off-by: Peter Kos --- sass/main.scss | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sass/main.scss b/sass/main.scss index 0e5cc83fb..7822e1d1d 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -48,9 +48,13 @@ $event-count: 6; display: inline-block; color: white; cursor: pointer; + @include button-effect($red); +} + +@mixin button-effect($color) { transition: 0.2s all; &:hover { - background-color: lighten($red, 5%); + background-color: lighten($color, 5%); } &:active { transform: translateY(4px); @@ -286,13 +290,17 @@ nav { } .slick-arrow { - margin-top: 70px; + margin-top: 50px; width: 60px; height: 60px; background-color: $blue; border: 2px solid #A3A9CA; box-sizing: border-box; border-radius: 50%; + + // slick-theme has a transform we don't need! + transform: none; + @include button-effect($blue); } // Make sure these appear over the slides! @@ -342,15 +350,12 @@ nav { #mlh { @include button; + @include button-effect($light-blue); background-color: $light-blue; margin: 0 auto; padding: 30px; border-radius: 20px; - &:hover { - background-color: lighten($light-blue, 5%); - } - i, p { display: inline; } @@ -398,8 +403,9 @@ nav { margin-bottom: $card-m; border-radius: 7px; background-color: $light-blue; - &:hover { - background-color: lighten($light-blue, 5%); + @include button-effect($light-blue); + &:active { + transform: none; } .accordion-header { background-color: transparent;