From b2e09afbf917a535362b6ac093a4faf1658f12ba Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Mon, 6 Jun 2022 14:12:37 -0400
Subject: [PATCH] ISTWCMS-5595: css for presentation of site container, fix of
inverted-left-L layout twig
---
src/patterns/03-layouts/content/content.twig | 3 +++
src/patterns/03-layouts/footer/footer.twig | 9 +++++++-
src/patterns/03-layouts/layout/_layout.scss | 1 +
src/patterns/03-layouts/layout/_layout.twig | 2 ++
.../layout/layout--1-col/layout--1-col.twig | 2 +-
.../layout/layout--2-col/layout--2-col.twig | 2 +-
.../layout/layout--3-col/layout--3-col.twig | 2 +-
.../layout/layout--4-col/layout--4-col.twig | 2 +-
.../layout/layout--5-col/layout--5-col.twig | 2 +-
.../layout--inverted-l-left.twig | 2 +-
.../layout--inverted-l-right.twig | 2 +-
src/patterns/03-layouts/region/region.twig | 2 --
.../04-components/color-bar/_color-bar.scss | 2 +-
src/patterns/global.scss | 1 -
uw_wcms_ohana.libraries.yml | 22 +++++++++++++++++++
15 files changed, 44 insertions(+), 12 deletions(-)
create mode 100644 uw_wcms_ohana.libraries.yml
diff --git a/src/patterns/03-layouts/content/content.twig b/src/patterns/03-layouts/content/content.twig
index 6bc42415..0086385e 100644
--- a/src/patterns/03-layouts/content/content.twig
+++ b/src/patterns/03-layouts/content/content.twig
@@ -1,8 +1,11 @@
{% set main_classes = 'uw-main' %}
+<!-- Button for show and hide of admin -->
<button class="uw-show-hide" id="revision-show-hide" title="Show/hide revision elements">±</button>
+<!-- end -->
{% for class in classes %}
{% set main_classes = main_classes ~ ' ' ~ class %}
{% endfor %}
+
<main id="main" class="{{ main_classes }}" role="main" tabindex="-1">
{% block content %}
Main content
diff --git a/src/patterns/03-layouts/footer/footer.twig b/src/patterns/03-layouts/footer/footer.twig
index b11bfaa3..141a9030 100644
--- a/src/patterns/03-layouts/footer/footer.twig
+++ b/src/patterns/03-layouts/footer/footer.twig
@@ -1,7 +1,14 @@
<footer class="uw-footer"{% if branding_level == 'full' %} role="contentinfo"{% endif %}>
<div class="uw-site-footer__block">
{% block content %}
-
+ {% include "@layouts/site-footer/site-footer.twig" with {
+ body: "The standard Lorem Ipsum passage, used since the 1500s<br /><br />Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+ site_name: "Faculty of Environment",
+ logo_link: "https://uwaterloo.ca/",
+ logo_url: "/uw_wcms_gesso/source/images/logos/uwaterloo-logo.svg",
+ logo_alt_text: "Faculty of Environment",
+ facebook: "https://www.facebook.com/University.Waterloo"
+ } %}
{% endblock %}
</div>
<div class="uw-footer__wrapper">
diff --git a/src/patterns/03-layouts/layout/_layout.scss b/src/patterns/03-layouts/layout/_layout.scss
index 447689f2..8916c64e 100644
--- a/src/patterns/03-layouts/layout/_layout.scss
+++ b/src/patterns/03-layouts/layout/_layout.scss
@@ -1,4 +1,5 @@
@use '../../01-core' as *;
+
.layout {
@include layout-constrain;
diff --git a/src/patterns/03-layouts/layout/_layout.twig b/src/patterns/03-layouts/layout/_layout.twig
index fa8f0035..b442c69b 100644
--- a/src/patterns/03-layouts/layout/_layout.twig
+++ b/src/patterns/03-layouts/layout/_layout.twig
@@ -1,3 +1,5 @@
+{{ attach_library('uw_wcms_ohana/layout') }}
+
{% set section_names = {
1: 'first',
2: 'second',
diff --git a/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig b/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
index 838de14d..cdff77ed 100644
--- a/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
+++ b/src/patterns/03-layouts/layout/layout--1-col/layout--1-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig b/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
index 708ac519..43ab88b4 100644
--- a/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
+++ b/src/patterns/03-layouts/layout/layout--2-col/layout--2-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig b/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
index 94919c41..1da7dbf1 100644
--- a/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
+++ b/src/patterns/03-layouts/layout/layout--3-col/layout--3-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig b/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
index 9c2a605b..698f9b15 100644
--- a/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
+++ b/src/patterns/03-layouts/layout/layout--4-col/layout--4-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig b/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
index 8d531886..f5e6862c 100644
--- a/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
+++ b/src/patterns/03-layouts/layout/layout--5-col/layout--5-col.twig
@@ -18,4 +18,4 @@
num_of_blocks: num_of_blocks,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig b/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
index 0ce52523..491f9312 100644
--- a/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
+++ b/src/patterns/03-layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig
@@ -20,4 +20,4 @@
inverted_l_left: 1,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig b/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
index e869a26b..81dc64a0 100644
--- a/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
+++ b/src/patterns/03-layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig
@@ -20,4 +20,4 @@
inverted_l_right: 1,
} %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/patterns/03-layouts/region/region.twig b/src/patterns/03-layouts/region/region.twig
index 5ba6da56..d853dbc6 100644
--- a/src/patterns/03-layouts/region/region.twig
+++ b/src/patterns/03-layouts/region/region.twig
@@ -1,5 +1,3 @@
-{{ attach_library('ohana/region')}}
-
<section class="l-{{ region_name ?: 'region' }}">
{% if constrain %}
<div class="l-constrain {{ constrain }}">
diff --git a/src/patterns/04-components/color-bar/_color-bar.scss b/src/patterns/04-components/color-bar/_color-bar.scss
index e1fbd817..88800fbb 100644
--- a/src/patterns/04-components/color-bar/_color-bar.scss
+++ b/src/patterns/04-components/color-bar/_color-bar.scss
@@ -1,6 +1,6 @@
$defaults: 'uw-gold';
$faculties: 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school', 'org-stp', 'org-cgc', 'org-stj', 'org-ren';
-$lvls: 'lvl1', 'lvl2', 'lvl3', 'lvl4';
+$lvls: '--color1', 'lvl2', 'lvl3', 'lvl4';
@each $default in $defaults {
@each $lvl in $lvls {
diff --git a/src/patterns/global.scss b/src/patterns/global.scss
index 7948a515..05b97748 100644
--- a/src/patterns/global.scss
+++ b/src/patterns/global.scss
@@ -5,4 +5,3 @@
@use '01-core/props' as *;
@use '01-core/utilities' as *;
@use '01-core/elements' as *;
-@use '03-layouts' as *;
diff --git a/uw_wcms_ohana.libraries.yml b/uw_wcms_ohana.libraries.yml
new file mode 100644
index 00000000..d941d3a2
--- /dev/null
+++ b/uw_wcms_ohana.libraries.yml
@@ -0,0 +1,22 @@
+name: 'WCMS Ohana'
+description: 'Provides stylings to WCMS'
+type: module
+core_version_requirement: '^8 || ^9'
+components:
+ namespaces:
+ core:
+ - src/patterns/01-core
+ base:
+ - src/patterns/02-base
+ layouts:
+ - src/patterns/03-layouts
+ components:
+ - src/patterns/04-components
+ composites:
+ - src/patterns/05-composites
+ templates:
+ - src/patterns/06-templates
+ pages:
+ - src/patterns/06-pages
+dependencies:
+ - components:components
--
GitLab