additional continue rebase

source/_annotations/annotations.js

-/**
- * @file
- */
-
 var comments = {
 "comments" : [
     {

source/_patterns/00-config/01-mixins/_mixins.uw.scss

@@ -42,11 +42,21 @@ $test-color-12: #f00;
   margin-left: -50vw;
   margin-right: -50vw;
   max-width: 100vw;
+  padding:0;
   position: relative;
   right: 50%;
   width: 100vw;
 }
-
+@mixin uw-full-width-reset {
+  left: 0;
+  margin-left: -1rem;
+  margin-right: -1rem;
+  max-width: 100%;
+  padding: 0;
+  position: relative;
+  right:  0;
+  width: 100%;
+}
 // Flexbox display
 @mixin flexbox {
 

source/_patterns/00-config/_design-tokens.artifact.scss

@@ -511,4 +511,4 @@ $gesso: (
     xxl: 96px,
   ),
   gutter-width: 40px,
-);
+);
\ No newline at end of file

source/_patterns/03-layouts/layout/_layout.scss

-$grid-gap: 1.5rem;
+$grid-gap: 2rem;
+@include medium{
+  $grid-gap: 2rem;
+}
 .layout {
   @include uw-contained-width;
   grid-gap:$grid-gap;
@@ -7,54 +10,59 @@ $grid-gap: 1.5rem;
     //background: $test-color-6;
     padding: rem(gesso-spacing(sm));
 
-    //@include xxl {
-    //  padding: rem(gesso-spacing(sm)) 0;
-    //}
+    @include xxl {
+      padding: rem(gesso-spacing(sm)) 0;
+    }
 
     &--narrow {
-      //background: $test-color-9;
       /* Match the width of WCMS2's narrow: 496px */
       max-width: 31rem;
     }
 
     &--wide {
-      //background: $test-color-2;
       /* Match the width of WCMS2's wide: 753px */
       max-width: 47.0625rem;
     }
   }
 
   &.uw-full-width {
+    .uw-section-has-full-width.uw-node__with-sidebar &{
+      padding: 0 gesso-spacing(sm) !important;
+    }
     @include uw-full-width-padding;
-    //background: $test-color-3;
     .dashboards-container &{
       @include uw-full-width;
     }
     &.layout--uw-1-col{
-      //background: $test-color-5;
       overflow:hidden;
       .block-inline-blockuw-cbl-banner-images,
       .block-inline-blockuw-cbl-image,
       .block-inline-blockuw-cbl-remote-video {
         @include uw-full-width-margin;
-        //background: $test-color-10;
-        object-fit: cover;
         h2{
           margin-left:1rem;
         }
+        .uw-section-has-full-width.uw-node__with-sidebar &{
+          @include uw-full-width-reset;
+        }
       }
       .block-inline-blockuw-cbl-google-maps{
-        @include large{
+        @include medium{
           @include uw-full-width-margin;
         }
+        .uw-section-has-full-width.uw-node__with-sidebar &{
+          @include uw-full-width-reset;
+        }
+        h2{
+          margin-left:1rem;
+        }
       }
     }
   }
-
   // When wrapped with class to identify sidebar
   .uw-node__with-sidebar & {
     margin: inherit;
-    max-width: 100%;
+
     @include medium {
       @include uw-contained-width;
     }

source/_patterns/03-layouts/node/_node.scss

@@ -5,13 +5,18 @@ $sidebar-gap: $grid-gap;
     display: block;
   }
   &__sidebar{
+    background: $test-color-9;
     display:none;
+    *{
+      padding-right:0.25rem;
+    }
   }
   // Reset the grid to become flexed when we have sidebar.
   &.uw-node__with-sidebar{
     .uw-node__grid{
       display: flex;
       flex-direction: column;
+      gap:$sidebar-gap;
       justify-content: center;
       .layout{
         margin:0 auto;
@@ -21,24 +26,26 @@ $sidebar-gap: $grid-gap;
         margin:0 auto;
       }
       .uw-full-width{
+
         width:100vw;
+
       }
       @include medium {
         flex-direction: row;
         gap:$sidebar-gap;
         .layout{
-          width: clamp(320px, 875px, calc(100vw - 333px));
+          width: clamp(320px, 868px, calc(100vw - 347px));
         }
         .uw-contained-width{
-          width: clamp(320px, 875px, calc(100vw - 333px));
+          width: clamp(320px, 868px, calc(100vw - 347px));
         }
         /* Match the width of WCMS2's narrow: 496px */
         .uw-contained-width--narrow{
-          width: clamp(320px, 496px, calc(100vw - 333px));
+          width: clamp(320px, 496px, calc(100vw - 347px));
         }
         /* Match the width of WCMS2's wide: 753px */
         .uw-contained-width--wide{
-          width: clamp(320px, 753px, calc(100vw - 333px));
+          width: clamp(320px, 753px, calc(100vw -  347px));
         }
       }
     }
@@ -63,7 +70,7 @@ $sidebar-gap: $grid-gap;
     .uw-node__node{
       width:100%;
       @include medium {
-        width: calc(100vw - 325px);
+        width: calc(100vw - 347px);
       }
     }
     .uw-full-width{