Fix divider and content order when flowing as row with a custom sidebar placement

Author: manuelpuyol

src/layout/layout.scss

@@ -128,6 +128,16 @@
     .Layout-main {
       grid-column: 3 / span 1;
     }
+
+    &.Layout--sidebarPosition-end {
+      .Layout-sidebar {
+        grid-column: 3 / span 1;
+      }
+
+      .Layout-main {
+        grid-column: 1;
+      }
+    }
   }
 }
 

src/layout/mixins.scss

@@ -11,10 +11,6 @@
       grid-column: 1 !important;
     }
 
-  &.Layout--divided {
-    @include flow-as-row-divider;
-  }
-
   &.Layout--sidebarPosition-flowRow-start {
     .Layout-sidebar {
       grid-row: 1;
@@ -40,13 +36,32 @@
       display: none;
     }
   }
+
+  &.Layout--divided {
+    @include flow-as-row-divider;
+
+    .Layout-main {
+      grid-row: 3 / span 1;
+    }
+
+    &.Layout--sidebarPosition-flowRow-end {
+      .Layout-sidebar {
+        grid-row: 3 / span 1;
+      }
+
+      .Layout-main {
+        grid-row: 1;
+      }
+    }
+  }
 }
 
 @mixin flow-as-row-divider {
   --Layout-gutter: 0;
 
   .Layout-divider {
     height: 1px;
+    grid-row: 2;
 
     &.Layout-divider--flowRow-hidden {
       display: none;