From c7ef588a9d786e8be5ebb901cda36127d7d16b84 Mon Sep 17 00:00:00 2001 From: Steve Goode <52213009+SociableSteve@users.noreply.github.com> Date: Mon, 31 Jul 2023 12:00:19 +0100 Subject: [PATCH] Fixed breadcrumbs (#96) * Fixed breadcrumbs Added breadcrumb chevron back in, and changed to show inside hero instead of content when one exists * Added check in case there is a hero --- assets/images/icons/svgs/chevron-right-n400.svg | 3 +++ assets/style/breadcrumbs.css | 3 ++- layouts/default.html | 16 +++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 assets/images/icons/svgs/chevron-right-n400.svg diff --git a/assets/images/icons/svgs/chevron-right-n400.svg b/assets/images/icons/svgs/chevron-right-n400.svg new file mode 100644 index 000000000..cf6f4d5f6 --- /dev/null +++ b/assets/images/icons/svgs/chevron-right-n400.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/style/breadcrumbs.css b/assets/style/breadcrumbs.css index 02a5ab0e3..de4895b94 100644 --- a/assets/style/breadcrumbs.css +++ b/assets/style/breadcrumbs.css @@ -5,10 +5,11 @@ margin: 0; padding: 0; line-height: 1.3rem; + color: var(--neutral-n400); } .breadcrumbs li:not(:first-of-type) { - background-image: url("/images/chevron_right.svg"); + background-image: url("/images/icons/svgs/chevron-right-n400.svg"); background-repeat: no-repeat; padding-left: 1.625rem; /* make space for the background image */ } diff --git a/layouts/default.html b/layouts/default.html index 7e5995b93..d559c57f7 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -7,10 +7,16 @@ > <%= render("/_sitehead/") %> - <%= render("/components/header/") %> <%= render("/_nav/", - :section_navigation => has_subnav?(@item) && subnav_items(@item).length > 0) - %> <% if @item[:hero] %> -
<%= render(@item[:hero]) %>
+ <%= render("/components/header/") %> + <%= render("/_nav/", :section_navigation => has_subnav?(@item) && subnav_items(@item).length > 0) %> + + <% if @item[:hero] %> +
+ <% if (@item.identifier != '/') %> + <%= render("/components/breadcrumbs/") %> + <% end %> + <%= render(@item[:hero]) %> +
<%end%>
@@ -29,7 +35,7 @@ <% end %>
- <% if (@item.identifier != '/') %> + <% if (@item.identifier != '/' && !@item[:hero]) %> <%= render("/components/breadcrumbs/") %> <% end %>