From bebccdacf432f490923d111104d22708388ff7f7 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Mon, 6 Jun 2022 15:37:15 -0400
Subject: [PATCH] ISTWCMS-5595: organizing the layout/_index.scss to make the
site container display correctly
---
src/patterns/01-core/mixins/_uw-mixins.scss | 2 +-
src/patterns/03-layouts/_index.scss | 11 +++++++++--
src/patterns/03-layouts/layout/_layout-base.scss | 7 -------
src/patterns/03-layouts/layout/_layout.twig | 2 --
src/patterns/global.scss | 1 +
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/patterns/01-core/mixins/_uw-mixins.scss b/src/patterns/01-core/mixins/_uw-mixins.scss
index ffd832bf..3b1506b1 100644
--- a/src/patterns/01-core/mixins/_uw-mixins.scss
+++ b/src/patterns/01-core/mixins/_uw-mixins.scss
@@ -19,7 +19,7 @@ $test-color-12: var(--green-5);
word-wrap: break-word;
}
-@mixin uw-contained-width($value:$max-width) {
+@mixin uw-contained-width($value:var(--layout-max-width)) {
margin-left: auto;
margin-right: auto;
max-width: $value;
diff --git a/src/patterns/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss
index 2cb5f83a..4897734f 100644
--- a/src/patterns/03-layouts/_index.scss
+++ b/src/patterns/03-layouts/_index.scss
@@ -1,12 +1,19 @@
// @file
// Styles layouts
-@use '../01-core' as *;
+
@use 'content/content' as *;
@use 'footer/footer' as *;
@use 'grid/grid' as *;
@use 'header/header' as *;
@use 'region/region' as *;
-@use 'layout/layout-base' as *;
@use 'layout/layout' as *;
+@use 'layout/layout-base' as *;
+@use 'layout/layout--1-col/layout--1-col' as *;
+@use 'layout/layout--2-col/layout--2-col' as *;
+@use 'layout/layout--3-col/layout--3-col' as *;
+@use 'layout/layout--4-col/layout--4-col' as *;
+@use 'layout/layout--5-col/layout--5-col' as *;
+@use 'layout/layout--inverted-l-left/layout--inverted-l-left' as *;
+@use 'layout/layout--inverted-l-right/layout--inverted-l-right' as *;
@use 'site-container/site-container' as *;
@use 'site-footer/site-footer' as *;
diff --git a/src/patterns/03-layouts/layout/_layout-base.scss b/src/patterns/03-layouts/layout/_layout-base.scss
index 3225dc88..fb1c1d31 100644
--- a/src/patterns/03-layouts/layout/_layout-base.scss
+++ b/src/patterns/03-layouts/layout/_layout-base.scss
@@ -1,11 +1,4 @@
@use '../../01-core' as *;
-@use '../../03-layouts/layout/layout--1-col/layout--1-col' as *;
-@use '../../03-layouts/layout/layout--2-col/layout--2-col' as *;
-@use '../../03-layouts/layout/layout--3-col/layout--3-col' as *;
-@use '../../03-layouts/layout/layout--4-col/layout--4-col' as *;
-@use '../../03-layouts/layout/layout--5-col/layout--5-col' as *;
-@use '../../03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left' as *;
-@use '../../03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right' as *;
.layout__region {
diff --git a/src/patterns/03-layouts/layout/_layout.twig b/src/patterns/03-layouts/layout/_layout.twig
index b442c69b..fa8f0035 100644
--- a/src/patterns/03-layouts/layout/_layout.twig
+++ b/src/patterns/03-layouts/layout/_layout.twig
@@ -1,5 +1,3 @@
-{{ attach_library('uw_wcms_ohana/layout') }}
-
{% set section_names = {
1: 'first',
2: 'second',
diff --git a/src/patterns/global.scss b/src/patterns/global.scss
index 05b97748..7948a515 100644
--- a/src/patterns/global.scss
+++ b/src/patterns/global.scss
@@ -5,3 +5,4 @@
@use '01-core/props' as *;
@use '01-core/utilities' as *;
@use '01-core/elements' as *;
+@use '03-layouts' as *;
--
GitLab