From 7cb53d35be5ad6b61b662265797fe879e03b5174 Mon Sep 17 00:00:00 2001 From: David <84041288+Git-HorizonZz@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:43:46 -0500 Subject: [PATCH 1/2] Updates --- Gemfile.lock | 5 +++++ _includes/footer.html | 6 ++---- css/banners.sass | 4 ++-- css/grid.sass | 2 +- css/main.sass | 6 ++++++ index.html | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d6fb15a..6c57c206 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM faraday-net_http (3.1.0) net-http ffi (1.16.3) + ffi (1.16.3-x64-mingw-ucrt) forwardable-extended (2.6.0) gemoji (3.0.1) github-pages (228) @@ -225,6 +226,8 @@ GEM uri nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.2-x64-mingw-ucrt) + racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) octokit (4.25.1) @@ -261,6 +264,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.9.1) + unf_ext (0.0.9.1-x64-mingw-ucrt) unicode-display_width (1.8.0) uri (0.13.0) webrick (1.8.1) @@ -268,6 +272,7 @@ GEM PLATFORMS arm64-darwin-20 arm64-darwin-21 + x64-mingw-ucrt x86_64-linux DEPENDENCIES diff --git a/_includes/footer.html b/_includes/footer.html index c985803d..22380b49 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,13 +8,11 @@
We love our sponsors!
- - - - + + diff --git a/css/banners.sass b/css/banners.sass index 02256910..fd753a7d 100644 --- a/css/banners.sass +++ b/css/banners.sass @@ -17,7 +17,7 @@ margin: 0 3px 30px width: 120px position: relative - background: #0f4bcb + background: #d12727 color: white padding: 10px img @@ -28,7 +28,7 @@ content: '' position: absolute display: block - border: 60px solid #0f4bcb + border: 60px solid #d12727 border-top-width: 5px border-bottom: 20px transparent solid top: 100% diff --git a/css/grid.sass b/css/grid.sass index a56ac146..af455647 100644 --- a/css/grid.sass +++ b/css/grid.sass @@ -30,7 +30,7 @@ footer h5 p.label color: #ffffff - background-color: #d12727 + background-color: #2738d1 font-family: Adam font-size: 15px text-align: center diff --git a/css/main.sass b/css/main.sass index 551865f1..5c80a88b 100644 --- a/css/main.sass +++ b/css/main.sass @@ -228,6 +228,7 @@ nav z-index: 100 ul, li position: relative + border-radius: 10px ul list-style: none > ul @@ -237,6 +238,7 @@ nav display: block color: white padding: 12px 15px + span color: #ccc cursor: default @@ -245,10 +247,13 @@ nav padding: 0 &:hover background: #444 + border-radius: 8px .active background: #222 + border-radius: 8px &:hover background: #222 + border-radius: 8px a color: #ddd cursor: default @@ -280,6 +285,7 @@ nav text-decoration: none background: $vaered color: white + border-radius: 7px main padding: 40px diff --git a/index.html b/index.html index 24512c97..1bc2055c 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,7 @@

Welcome!

Striving for student enrichment, technical advancement, and success in the FIRST Robotics Competition.

- View our 2022 Robot + View our 2023 Robot
From c451f0afd7e9db28844451db02c7de398d3dbbfe Mon Sep 17 00:00:00 2001 From: David <84041288+Git-HorizonZz@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:53:19 -0500 Subject: [PATCH 2/2] Fixed Links Opening in new tab --- _includes/footer.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 22380b49..f56681a4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,13 +5,13 @@
We love our sponsors!
- - - - - - - + + + + + + +