From b11d222c4834fa135734bb12d46cd091257d7e4d Mon Sep 17 00:00:00 2001 From: Martin Leblanc <m26lebla@uwaterloo.ca> Date: Thu, 9 Jun 2022 09:15:44 -0400 Subject: [PATCH] ISTWCMS-5598: adding the rest of the layout's style sheets to layouts/_index.scss --- src/patterns/03-layouts/_index.scss | 6 ++++++ src/patterns/03-layouts/layout/_layout-base.scss | 7 +++++++ src/patterns/03-layouts/site-footer/_site-footer.scss | 2 +- src/patterns/global.scss | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/patterns/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss index 84166d05..7eb69aaf 100644 --- a/src/patterns/03-layouts/_index.scss +++ b/src/patterns/03-layouts/_index.scss @@ -1,4 +1,10 @@ +@forward 'content/content'; +@forward 'footer/footer'; @forward 'grid/grid'; +@forward 'header/header'; @forward 'layout/layout'; @forward 'layout/layout-base'; @forward 'node/node'; +@forward 'region/region'; +@forward 'site-container/site-container'; +@forward 'site-footer/site-footer'; diff --git a/src/patterns/03-layouts/layout/_layout-base.scss b/src/patterns/03-layouts/layout/_layout-base.scss index 32d337b7..e729d003 100644 --- a/src/patterns/03-layouts/layout/_layout-base.scss +++ b/src/patterns/03-layouts/layout/_layout-base.scss @@ -1,4 +1,11 @@ @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/site-footer/_site-footer.scss b/src/patterns/03-layouts/site-footer/_site-footer.scss index 56770bc7..26a38422 100644 --- a/src/patterns/03-layouts/site-footer/_site-footer.scss +++ b/src/patterns/03-layouts/site-footer/_site-footer.scss @@ -1,7 +1,7 @@ @use '../../01-core' as *; .uw-site-footer { - background-color: var(--gray-3); + background-color: var(--uw-black-3); &__wrapper { @include layout-constrain; display: grid; diff --git a/src/patterns/global.scss b/src/patterns/global.scss index d3e8b333..2e080ccd 100644 --- a/src/patterns/global.scss +++ b/src/patterns/global.scss @@ -5,5 +5,5 @@ @use '01-core/props' as *; @use '01-core/utilities' as *; @use '01-core/elements' as *; -@use '03-layouts' as *; ; +@use '03-layouts' as *; @use '04-components' as *; -- GitLab