Rebuild styles, fix merge conflict

digitoimistodude · Oct 25, 2024 · 2688e21 · 2688e21
2 parents 74ea415 + 0673ba1
commit 2688e21
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/css/dev/global.css b/css/dev/global.css
diff --git a/css/dev/gutenberg-editor-styles.css b/css/dev/gutenberg-editor-styles.css
diff --git a/css/prod/global.css b/css/prod/global.css
diff --git a/sass/layout/_site-header.scss b/sass/layout/_site-header.scss
@@ -1,7 +1,8 @@
 // The very top of the site, element that usually includes
 // the site navigation and search for example.
 .site-header {
-  align-items: center;
+  align-items: flex-start;
+  column-gap: var(--grid-gap);
   display: flex;
   justify-content: space-between;
   margin-left: auto;

diff --git a/sass/navigation/_nav-desktop.scss b/sass/navigation/_nav-desktop.scss
@@ -44,6 +44,7 @@
 
   // Navigation wrapper
   .nav-primary {
+    line-height: 0;
     padding-bottom: 0;
     padding-top: 0;
   }
@@ -52,11 +53,14 @@
   .menu-items {
     align-items: center;
     background-color: transparent;
+    column-gap: var(--gap-main-level-horizontal);
     display: flex;
-    gap: var(--gap-main-level-horizontal);
+    flex-wrap: wrap;
+    justify-content: flex-end;
     margin: 0;
     padding: 0;
     position: relative;
+    row-gap: 1rem;
   }
 
   // Navigation list item

diff --git a/sass/navigation/_nav-mobile.scss b/sass/navigation/_nav-mobile.scss
@@ -53,6 +53,11 @@
     background-color: var(--color-background-nav-mobile-header);
   }
 
+  // Fix burger navigation sometimes not being centered vertically
+  .nav-primary {
+    align-self: center;
+  }
+
   // General navigation resets for mobile
   .site-header ul,
   .site-header li,