From 8904eaf48be3fc7566aedafb0beff40330b1a796 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 17 Jun 2021 13:17:24 +0100
Subject: [PATCH] Make navigation respect width setting

---
 packages/server/src/constants/layouts.js      | 18 +++++--------
 packages/standard-components/manifest.json    |  4 +--
 .../standard-components/src/Layout.svelte     | 25 +++++++++----------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/packages/server/src/constants/layouts.js b/packages/server/src/constants/layouts.js
index a9b589af7e..f73c6519bc 100644
--- a/packages/server/src/constants/layouts.js
+++ b/packages/server/src/constants/layouts.js
@@ -34,13 +34,11 @@ const EMPTY_LAYOUT = {
     _styles: {
       active: {},
       hover: {},
-      normal: {
-        "background-image": "#f5f5f5",
-      },
+      normal: {},
       selected: {},
     },
     navigation: "Top",
-    contentWidth: "Large",
+    width: "Large",
     links: [
       {
         text: "Home",
@@ -84,13 +82,11 @@ const BASE_LAYOUTS = [
       _styles: {
         active: {},
         hover: {},
-        normal: {
-          background: "#f5f5f5",
-        },
+        normal: {},
         selected: {},
       },
       navigation: "Top",
-      contentWidth: "Large",
+      width: "Large",
       links: [
         {
           text: "Home",
@@ -132,13 +128,11 @@ const BASE_LAYOUTS = [
       _styles: {
         active: {},
         hover: {},
-        normal: {
-          background: "#f5f5f5",
-        },
+        normal: {},
         selected: {},
       },
       navigation: "Top",
-      contentWidth: "Large",
+      width: "Large",
       links: [
         {
           text: "Home",
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 1bc8967ada..bb67771a71 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -45,8 +45,8 @@
       },
       {
         "type": "select",
-        "label": "Content Width",
-        "key": "contentWidth",
+        "label": "Width",
+        "key": "width",
         "options": ["Small", "Medium", "Large"],
         "defaultValue": "Large"
       },
diff --git a/packages/standard-components/src/Layout.svelte b/packages/standard-components/src/Layout.svelte
index ffd8e2473a..fa3a118f4f 100644
--- a/packages/standard-components/src/Layout.svelte
+++ b/packages/standard-components/src/Layout.svelte
@@ -12,7 +12,7 @@
   export let navigation = "Top"
   export let sticky = false
   export let links
-  export let contentWidth = "Large"
+  export let width = "Large"
 
   const navigationClasses = {
     Top: "top",
@@ -27,7 +27,7 @@
 
   $: validLinks = links?.filter(link => link.text && link.url) || []
   $: typeClass = navigationClasses[navigation] || "none"
-  $: widthClass = widthClasses[contentWidth] || "l"
+  $: widthClass = widthClasses[width] || "l"
   let mobileOpen = false
 
   const isInternal = url => {
@@ -46,7 +46,7 @@
 <div class="layout layout--{typeClass}" use:styleable={$component.styles}>
   {#if typeClass !== "none"}
     <div class="nav-wrapper" class:sticky>
-      <div class="nav nav--{typeClass}">
+      <div class="nav nav--{typeClass} size--{widthClass}">
         <div class="nav-header">
           {#if validLinks?.length}
             <div class="burger">
@@ -104,7 +104,7 @@
     </div>
   {/if}
   <div class="main-wrapper">
-    <div class="main main--{widthClass}">
+    <div class="main size--{widthClass}">
       <slot />
     </div>
   </div>
@@ -142,8 +142,8 @@
     justify-content: flex-start;
     align-items: stretch;
     padding: var(--spacing-xl) 32px;
-    width: 1400px;
     max-width: 100%;
+    gap: var(--spacing-xl);
   }
   .nav-header {
     flex: 0 0 auto;
@@ -168,13 +168,13 @@
     position: relative;
     padding: 32px;
   }
-  .main--s {
+  .size--s {
     width: 800px;
   }
-  .main--m {
+  .size--m {
     width: 1100px;
   }
-  .main--l {
+  .size--l {
     width: 1400px;
   }
 
@@ -201,7 +201,8 @@
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
-    gap: var(--spacing-l);
+    gap: var(--spacing-xl);
+    margin-top: var(--spacing-xl);
   }
   .link {
     color: var(--spectrum-alias-text-color);
@@ -233,12 +234,8 @@
       overflow: auto;
     }
 
-    .nav--top {
-      gap: var(--spacing-xl);
-    }
     .nav--left {
       width: 250px;
-      gap: var(--spacing-xl);
       padding: var(--spacing-xl);
     }
 
@@ -246,6 +243,7 @@
       height: 36px;
     }
     .nav--left .links {
+      margin-top: 0;
       flex-direction: column;
       justify-content: flex-start;
       align-items: stretch;
@@ -291,6 +289,7 @@
 
     /* Transform links into drawer */
     .links {
+      margin-top: 0;
       position: fixed;
       top: 0;
       left: -250px;