From e4b3c8f319c9f62630c5a84b21a98b78f24795d9 Mon Sep 17 00:00:00 2001
From: David Mears <clarinet.david@gmail.com>
Date: Tue, 16 Jul 2024 20:42:17 +0100
Subject: [PATCH] Improve styling of breadcrumbs

---
 assets/scss/_variables.scss |  8 --------
 components/AppHeader.vue    | 32 +++++++++++++++++++++-----------
 components/BreadCrumb.vue   | 13 +++++++++++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index fff74ce8..d4574c21 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -31,14 +31,6 @@ $danger: $imperial-red;
 $warning: $imperial-tangerine;
 $info: $imperial-pool-blue;
 $breadcrumb-divider: '>';
-// $grid-breakpoints: ( // Not actually overriding, just making variables available to our own styles
-//   xs: 0,
-//   sm: 576px,
-//   md: 768px,
-//   lg: 992px,
-//   xl: 1200px,
-//   xxl: 1400px
-// );
 
 // Copy variables from CoreUI without changing them, for referring to them
 // =======================================================================
diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index 68e6364e..c503a7cb 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <CHeader class="header-sticky p-0" :class="{ 'shadow-sm': isScrolled }">
-    <CContainer id="headerContainer" fluid class="border-bottom mt-1 justify-content-start">
+    <CContainer id="headerNavContainer" fluid class="border-bottom mt-1 justify-content-start">
       <CHeaderToggler class="d-lg-none" @click="toggleSidebarVisibility">
         <span data-testid="toggle-sidebar-button">
           <CIcon icon="cilMenu" size="lg" />
@@ -10,10 +10,10 @@
         <CIcon icon="cilGlobeAlt" size="lg" />
         <span id="appTitle">DAEDALUS Explore</span>
       </CHeaderBrand>
-      <div v-show="showBreadcrumbs" class="ms-5 d-none d-xxl-block">
+      <div v-show="showBreadcrumbs" class="ms-auto d-none d-md-block">
         <BreadCrumb />
       </div>
-      <CHeaderNav class="ms-auto">
+      <CHeaderNav>
         <CNavItem class="py-1">
           <div class="vr h-100 mx-1 text-body text-opacity-75" />
         </CNavItem>
@@ -22,7 +22,7 @@
         </CNavItem>
       </CHeaderNav>
     </CContainer>
-    <CContainer v-show="showBreadcrumbs" fluid class="d-xxl-none full-breadcrumb-container">
+    <CContainer v-show="showBreadcrumbs" fluid class="d-md-none full-breadcrumb-container">
       <BreadCrumb />
     </CContainer>
   </CHeader>
@@ -37,7 +37,7 @@ const emit = defineEmits(['toggleSidebarVisibility'])
 
 const route = useRoute()
 
-const showBreadcrumbs = computed(() => route.meta.hideBreadcrumbs !== true)
+const showBreadcrumbs = computed(() => !route.meta.hideBreadcrumbs)
 
 function toggleSidebarVisibility() {
   emit('toggleSidebarVisibility')
@@ -72,19 +72,29 @@ onBeforeUnmount(() => {
 }
 $sidebar-narrow-width: 4rem;
 .full-breadcrumb-container {
-  font-size: 0.74rem;
+  min-height: 2.5rem !important;
 
   @media (min-width: map.get($grid-breakpoints, 'lg')) {
-    // For some reason, without !important, margin-left jumps on refresh.
-    margin-left: calc($sidebar-narrow-width + 0.5rem) !important;
+    margin-left: calc($sidebar-narrow-width + 0.5rem);
+  }
+
+  background-color: rgb(250, 250, 250);
+}
+.header-nav {
+  margin-left: auto;
+  @media (min-width: map.get($grid-breakpoints, 'lg')) {
+    margin-left: 1rem;
   }
 }
 
 // Align sidebar toggler with sidebar icons
-#headerContainer {
-  padding-left: 0.9rem;
+#headerNavContainer {
+  padding-left: 1.5rem;
+  @media (min-width: map.get($grid-breakpoints, 'lg')) {
+    padding-left: 0.9rem;
+  }
   @media (max-width: map.get($grid-breakpoints, 'lg')) {
-    padding-left: 1.5rem;
+    border-bottom-color: rgb(235, 238, 245) !important;
   }
 }
 #help {
diff --git a/components/BreadCrumb.vue b/components/BreadCrumb.vue
index 28d27c5f..4cdd3864 100644
--- a/components/BreadCrumb.vue
+++ b/components/BreadCrumb.vue
@@ -9,17 +9,26 @@ I expect that to change based on how we end up making routes work. -->
       :href="item.href"
       :class="index === items.length - 1 ? 'active' : ''"
     >
-      {{ item.text }}
+      <small>{{ item.text }}</small>
     </CBreadcrumbItem>
   </CBreadcrumb>
 </template>
 
 <script lang="ts" setup>
 import { useRoute } from 'vue-router'
+
 const route = useRoute()
 
 const items = route.meta.breadcrumbs || []
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+@use "sass:map";
+
+.breadcrumb {
+  .breadcrumb-item a {
+    color: rgba($imperial-blue, 0.8);
+    text-decoration: none !important;
+  }
+}
 </style>