From 82830238000d17a6ab1eaba785e229d5949eb298 Mon Sep 17 00:00:00 2001 From: Matt Moretti Date: Thu, 15 Jan 2026 16:27:25 -0500 Subject: [PATCH 1/4] Move header and footer to partials, add header. --- .../images/UMassAmherst_longform-reversed.svg | 125 ++++++++++++++++++ .../UMassAmherst_shortform-reversed.svg | 55 ++++++++ app/views/layouts/_footer.html.erb | 10 ++ app/views/layouts/_header.html.erb | 41 ++++++ app/views/layouts/application.html.erb | 14 +- 5 files changed, 233 insertions(+), 12 deletions(-) create mode 100644 app/assets/images/UMassAmherst_longform-reversed.svg create mode 100644 app/assets/images/UMassAmherst_shortform-reversed.svg create mode 100644 app/views/layouts/_footer.html.erb create mode 100644 app/views/layouts/_header.html.erb diff --git a/app/assets/images/UMassAmherst_longform-reversed.svg b/app/assets/images/UMassAmherst_longform-reversed.svg new file mode 100644 index 000000000..2fdc22466 --- /dev/null +++ b/app/assets/images/UMassAmherst_longform-reversed.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/UMassAmherst_shortform-reversed.svg b/app/assets/images/UMassAmherst_shortform-reversed.svg new file mode 100644 index 000000000..24618a0cf --- /dev/null +++ b/app/assets/images/UMassAmherst_shortform-reversed.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb new file mode 100644 index 000000000..5a71f4c61 --- /dev/null +++ b/app/views/layouts/_footer.html.erb @@ -0,0 +1,10 @@ +<%# locals: () %> + diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb new file mode 100644 index 000000000..0b1a24415 --- /dev/null +++ b/app/views/layouts/_header.html.erb @@ -0,0 +1,41 @@ +<%# locals: () %> +
+ + +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0aeaacd6b..dabb26f8b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,11 +10,7 @@ <%= csp_meta_tag %> - + <%= render "layouts/header" %>
<%= yield %> @@ -29,12 +25,6 @@ <%# Spacer to avoid bottom navbar overlapping. %>
- + <%= render "layouts/footer" %> From f8879d812dd1c4c1486788ebb07b4c02b0982c15 Mon Sep 17 00:00:00 2001 From: Matt Moretti Date: Fri, 26 Jun 2026 10:19:02 -0400 Subject: [PATCH 2/4] UMass footer --- app/views/layouts/_footer.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 5a71f4c61..7f5dd1793 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -7,4 +7,15 @@ <%= strap_link_to "Mike McQuaid", "https://mikemcquaid.com", classes: "text-white hover:text-gray-200" %> + From e01ddea2d64b19b3dd4b8e7d193d0308c4a4b5d6 Mon Sep 17 00:00:00 2001 From: Matt Moretti Date: Fri, 26 Jun 2026 10:19:49 -0400 Subject: [PATCH 3/4] Octo-corner Primarily so it doesn't cover the UMass nav elements, but also not maroon-on-maroon --- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/_octo_corner.html.erb | 11 +++++++++++ app/views/layouts/application.html.erb | 6 +----- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 app/views/layouts/_octo_corner.html.erb diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 0b1a24415..b831a8dbb 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,7 +1,7 @@ <%# locals: () %>