From 2f588ef4275c9272fe68cc665c9224d75a48e6ff Mon Sep 17 00:00:00 2001
From: Pete <peterfrench94@gmail.com>
Date: Thu, 8 Feb 2024 09:59:18 +0100
Subject: [PATCH] Revert navigation padding

---
 static/sass/_pattern_navigation.scss | 16 ++++++++++++++--
 static/sass/styles.scss              | 12 ++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/static/sass/_pattern_navigation.scss b/static/sass/_pattern_navigation.scss
index 58719630616..3288b54d845 100644
--- a/static/sass/_pattern_navigation.scss
+++ b/static/sass/_pattern_navigation.scss
@@ -61,6 +61,14 @@ $meganav-height: 3rem;
       .p-navigation__items {
         width: 100%;
 
+        & > .p-navigation__item--dropdown-toggle > .p-navigation__link {
+          padding-left: $row-margin-small;
+
+          &::before {
+            left: $row-margin-small;
+          }
+        }
+
         @media (max-width: $breakpoint-navigation-threshold - 1) {
           .p-navigation__link {
             padding-left: calc(1.5rem + $row-margin-medium);
@@ -455,7 +463,7 @@ $meganav-height: 3rem;
       }
 
       .p-navigation__link::after {
-        top: 0.5rem;
+        top: 1rem;
       }
     }
 
@@ -485,7 +493,7 @@ $meganav-height: 3rem;
       }
     }
 
-    @media (min-width: $breakpoint-navigation-threshold - 1) {
+    @media (min-width: $breakpoint-navigation-threshold) {
       background-color: $color-dark;
       margin-bottom: 0;
 
@@ -627,6 +635,10 @@ $meganav-height: 3rem;
       }
     }
 
+    .p-navigation__item > .p-navigation__link {
+      padding-left: $row-margin-small;
+    }
+
     .p-navigation__banner {
       padding-left: 0;
     }
diff --git a/static/sass/styles.scss b/static/sass/styles.scss
index a6fd4cf23bc..5faca812fdf 100644
--- a/static/sass/styles.scss
+++ b/static/sass/styles.scss
@@ -1366,6 +1366,18 @@ $color-link-dark: #69c !default;
   }
 }
 
+.p-logo-section.has-misaligned-images {
+  .p-logo-section__item {
+    margin-bottom: $spv--x-large;
+  }
+
+  .p-logo-section__logo {
+    max-height: 5rem;
+    // make sure image aspect ratio is kept
+    object-fit: contain;
+  }
+}
+
 // XXX: pete f: vanilla issue here -
 // https://github.com/canonical/vanilla-framework/issues/4877
 .p-divider {