From 42726d64badb8ec4ecac35b92c07e4687c74c0f8 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Thu, 29 Sep 2022 13:42:48 -0400
Subject: [PATCH 01/11] ISTWCMS-5789:css to correct opportunity type card
 header, adding the : to the label pattern as per wcms2 pattern

---
 .../04-components/card/card--teaser/_card--teaser.scss      | 6 +++++-
 src/patterns/04-components/label/label.twig                 | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/patterns/04-components/card/card--teaser/_card--teaser.scss b/src/patterns/04-components/card/card--teaser/_card--teaser.scss
index cb31f2f..dbcf5e8 100644
--- a/src/patterns/04-components/card/card--teaser/_card--teaser.scss
+++ b/src/patterns/04-components/card/card--teaser/_card--teaser.scss
@@ -24,7 +24,11 @@
       padding: 0;
     }
   }
-
+  &--opportunity{
+    .card__header{
+      margin-bottom: var(--size-1);
+    }
+  }
   &--profile {
 
     .card {
diff --git a/src/patterns/04-components/label/label.twig b/src/patterns/04-components/label/label.twig
index 4d11ae3..787662a 100644
--- a/src/patterns/04-components/label/label.twig
+++ b/src/patterns/04-components/label/label.twig
@@ -1 +1 @@
-<span class="uw-label">{{ label }}</span>
+<span class="uw-label">{{ label }}:</span>
-- 
GitLab


From 51e0ee70e39b8560a5e38129190ba40e4a63c1aa Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Fri, 30 Sep 2022 11:49:50 -0400
Subject: [PATCH 02/11] ISTWCMS-5759: css to clean up the bleed into layout
 builder forms

---
 src/patterns/01-core/elements/_option.scss         |  2 +-
 src/patterns/01-core/elements/_select.scss         | 14 ++++++++++----
 src/patterns/01-core/mixins/_button.scss           |  4 ++--
 .../layout-builder/_layout-builder.scss            |  5 -----
 src/patterns/04-components/filters/_filters.scss   |  3 ++-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/patterns/01-core/elements/_option.scss b/src/patterns/01-core/elements/_option.scss
index ad161da..603e467 100644
--- a/src/patterns/01-core/elements/_option.scss
+++ b/src/patterns/01-core/elements/_option.scss
@@ -27,5 +27,5 @@ label.option,
   font-weight:  normal;
   letter-spacing:inherit;
   margin-left: var(--size-05);
-  padding: var(--size-1) 0 var(--size-1) var(--size-4);
+  padding: var(--size-1) 0;
 }
diff --git a/src/patterns/01-core/elements/_select.scss b/src/patterns/01-core/elements/_select.scss
index 0ab4b54..29cf29e 100644
--- a/src/patterns/01-core/elements/_select.scss
+++ b/src/patterns/01-core/elements/_select.scss
@@ -6,11 +6,12 @@
 :where(select) {
   @include svg-background(select-arrows);
   appearance: none;
-  background-color: var(--gray-2);
+  background-color: var(--gray-1);
   background-position: right 10px center; // LTR
   background-repeat: no-repeat;
   background-size: 20px;
-  border-radius: var(--radius-2);
+  border: var(--size-xs) solid  var(--gray-3);
+  border-radius: var(--radius-1);
   color: inherit;
   cursor: pointer;
   font-family: var(--font-systemmedium);
@@ -18,14 +19,19 @@
   letter-spacing: inherit;
   padding-block: .75ch;
   padding-inline: 1.25ch 0;
-  padding-right: 10px; // LTR
+  padding-right: var(--size-4); // LTR
   touch-action: manipulation;
+  width: 100%;
   &:-moz-focusring {
     color: transparent;
     text-shadow: 0 0 0 #000;
   }
-
   &::-ms-expand {
     display: none;
   }
 }
+.form-item-moderation-state-0-state{
+  .form-select{
+    width: auto;
+  }
+}
diff --git a/src/patterns/01-core/mixins/_button.scss b/src/patterns/01-core/mixins/_button.scss
index e6c8ff2..506c743 100644
--- a/src/patterns/01-core/mixins/_button.scss
+++ b/src/patterns/01-core/mixins/_button.scss
@@ -149,7 +149,7 @@ $button-font-size: var(--font-size-1) !default;
   background: var(--uw-white) !important;
   color: var(--uw-black) !important;
   padding: var(--size-1) var(--size-2);
-  width:auto;
+  width: auto;
   &:hover,
   &:focus {
     border: 1px solid transparent !important;
@@ -167,7 +167,7 @@ $button-font-size: var(--font-size-1) !default;
   color: var(--uw-white) !important;
   background: var(--uw-black) !important;
   padding: var(--size-1) var(--size-2);
-  width:auto;
+  width: auto;
   &:hover,
   &:focus {
     border: 1px solid transparent !important;
diff --git a/src/patterns/04-components/00-cms-styles/layout-builder/_layout-builder.scss b/src/patterns/04-components/00-cms-styles/layout-builder/_layout-builder.scss
index 817a986..8102abf 100644
--- a/src/patterns/04-components/00-cms-styles/layout-builder/_layout-builder.scss
+++ b/src/patterns/04-components/00-cms-styles/layout-builder/_layout-builder.scss
@@ -134,11 +134,6 @@ form {
     padding: 0 var(--size-2);
     text-align: center;
   }
-  // Removes gap at bottom of editor in dialogue
-  .odd .form-item,
-  .even .form-item {
-    margin-bottom: 0 !important;
-  }
 
   // Resets the min width.
   .field-multiple-table {
diff --git a/src/patterns/04-components/filters/_filters.scss b/src/patterns/04-components/filters/_filters.scss
index a738317..d643437 100644
--- a/src/patterns/04-components/filters/_filters.scss
+++ b/src/patterns/04-components/filters/_filters.scss
@@ -5,7 +5,7 @@
  */
 @use '../../01-core' as *;
 
-.views-exposed-form{
+.views-exposed-form.bef-exposed-form{
   margin: 0 !important;
   padding: 0 !important;
   .form-actions{
@@ -86,6 +86,7 @@
     display: block;
     font-family: inherit;
     font-size: inherit;
+    padding: var(--size-1) 0 var(--size-1) var(--size-4);
     position: relative;
     &::before,
     &::after {
-- 
GitLab


From 0e939bc4f43c3d47fa664593fadfccf6a821d0b2 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Fri, 30 Sep 2022 13:12:23 -0400
Subject: [PATCH 03/11] ISTWCMS-5789: adding the sidebar - NOT COMPLETE getting
 code in to be reviewed

---
 src/patterns/03-layouts/_index.scss           |   1 +
 src/patterns/03-layouts/sidebar/_sidebar.scss |  48 ++++++++
 src/patterns/03-layouts/sidebar/sidebar.twig  | 112 ++++++++++++++++++
 src/patterns/03-layouts/sidebar/sidebar.yml   |  11 ++
 .../03-layouts/sidebar/sidebar~right.yml      |  11 ++
 5 files changed, 183 insertions(+)
 create mode 100644 src/patterns/03-layouts/sidebar/_sidebar.scss
 create mode 100644 src/patterns/03-layouts/sidebar/sidebar.twig
 create mode 100644 src/patterns/03-layouts/sidebar/sidebar.yml
 create mode 100644 src/patterns/03-layouts/sidebar/sidebar~right.yml

diff --git a/src/patterns/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss
index 70e4092..f851399 100644
--- a/src/patterns/03-layouts/_index.scss
+++ b/src/patterns/03-layouts/_index.scss
@@ -8,5 +8,6 @@
 @forward 'layout/layout-base';
 @forward 'node/node';
 @forward 'region/region';
+@forward 'sidebar/sidebar';
 @forward 'site-container/site-container';
 @forward 'site-footer/site-footer';
diff --git a/src/patterns/03-layouts/sidebar/_sidebar.scss b/src/patterns/03-layouts/sidebar/_sidebar.scss
new file mode 100644
index 0000000..cca1ea4
--- /dev/null
+++ b/src/patterns/03-layouts/sidebar/_sidebar.scss
@@ -0,0 +1,48 @@
+// @file
+// Styles for the Sidebar layout.
+
+@use '../../01-core' as *;
+
+$l-sidebar-bp: 900px;
+$l-sidebar-width: 300px;
+$l-sidebar-gutter: var(--size-2);
+
+//.l-sidebar {
+//  margin-bottom: var(--size-10);
+//  width: 100%;
+//}
+//
+//.l-sidebar__grid {
+//  @media(min-width: $screen-md) {
+//    display: flex;
+//    flex-wrap: wrap;
+//  }
+//}
+//
+//.l-sidebar__aside {
+//  @media(min-width: $screen-md) {
+//    display: block;
+//    flex-basis: $l-sidebar-width;
+//    flex-grow: 0;
+//    flex-shrink: 0;
+//    margin-left: 0;
+//    margin-right: 0;
+//    width: $l-sidebar-width;
+//
+//    .l-sidebar--right & {
+//      order: 1;
+//    }
+//  }
+//}
+//
+//.l-sidebar__main {
+//  max-width: 100%;
+//  position: relative;
+//
+//  @media(min-width: $screen-md) {
+//    flex-basis: calc(100% - #{$l-sidebar-width});
+//    flex-grow: 1;
+//    flex-shrink: 0;
+//    width: calc(100% - #{$l-sidebar-width});
+//  }
+//}
diff --git a/src/patterns/03-layouts/sidebar/sidebar.twig b/src/patterns/03-layouts/sidebar/sidebar.twig
new file mode 100644
index 0000000..ef67b0a
--- /dev/null
+++ b/src/patterns/03-layouts/sidebar/sidebar.twig
@@ -0,0 +1,112 @@
+
+{% set additional_header_region_attributes =  [
+  'l-sidebar__full',
+  attributes ? attributes.class
+  ]|join(' ')|trim %}
+
+{% set additional_sidebar_first_region_attributes  =  [
+  'l-sidebar__sidebar',
+  attributes ? attributes.class
+  ]|join(' ')|trim %}
+
+{% set additional_main_region_attributes =  [
+  'l-sidebar__main',
+  attributes ? attributes.class
+  ]|join(' ')|trim %}
+
+{% set additional_sidebar_second_region_attributes  =  [
+  'l-sidebar__sidebar',
+  attributes ? attributes.class
+  ]|join(' ')|trim %}
+
+{% set sidebar_classes =  [
+  'l-sidebar',
+  has_multiple_sidebar ? ' l-sidebar--multi-2',
+  modifier_classes,
+  attributes ? attributes.class
+]|join(' ')|trim%}
+
+<div class="{{ sidebar_classes }}" {{ attributes ? attributes|without('class') }}>
+
+
+  <!-- Dump code -->
+  <pre>
+    {{ dump(sidebar) }}
+ </pre>
+
+
+  {% if header_content %}
+    <div class="{{ additional_sidebar_first_region_attributes }}">
+      {{ header_content }}
+    </div>
+  {% endif %}
+
+  {% if sidebar_first_content %}
+   <aside class="{{ additional_sidebar_first_region_attributes }} ">
+      {{ sidebar_first_content }}
+    </aside>
+  {% endif %}
+
+  {% if main_content %}
+    <div class=" {{ additional_main_region_attributes }} ">
+      {{ main_content }}
+    </div>
+  {% endif %}
+
+  {% if sidebar_second_content %}
+    <aside class="{{ additional_sidebar_second_region_attributes }} ">
+      {{ sidebar_second_content }}
+    </aside>
+  {% endif %}
+</div>
+
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
+
+<div class="l-sidebar {{ modifier }}">
+  {% if header %}
+    <div class="l-sidebar__header">
+      {% block header %}
+        {{ header }}
+      {% endblock %}
+    </div>
+  {% endif %}
+
+ {% if constrain %}
+    <div class="{{ constrain }}">
+  {% endif %}
+
+  <div class="l-sidebar__grid">
+    {% if aside %}
+      <aside class="l-sidebar__aside">
+        {% block aside %}
+          {{ aside }}
+        {% endblock %}
+      </aside>
+    {% endif %}
+
+    <div class="l-sidebar__main">
+      {% block main %}
+        {{ main }}
+      {% endblock %}
+    </div>
+  </div>
+
+  {% if constrain %}
+    </div>
+  {% endif %}
+
+  {% if footer %}
+    <div class="l-sidebar__footer">
+      {% block footer %}
+        {{ footer }}
+      {% endblock %}
+    </div>
+  {% endif %}
+</div>
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
+<!-- Ohana Chaz code -->
diff --git a/src/patterns/03-layouts/sidebar/sidebar.yml b/src/patterns/03-layouts/sidebar/sidebar.yml
new file mode 100644
index 0000000..bbfd051
--- /dev/null
+++ b/src/patterns/03-layouts/sidebar/sidebar.yml
@@ -0,0 +1,11 @@
+---
+modifier: ''
+constrain: ''
+header: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Header</p>
+aside: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Aside</p>
+main: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Main Content</p>
+footer: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Footer</p>
diff --git a/src/patterns/03-layouts/sidebar/sidebar~right.yml b/src/patterns/03-layouts/sidebar/sidebar~right.yml
new file mode 100644
index 0000000..6c1d5d3
--- /dev/null
+++ b/src/patterns/03-layouts/sidebar/sidebar~right.yml
@@ -0,0 +1,11 @@
+---
+modifier: 'l-sidebar--right'
+constrain: ''
+header: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Header</p>
+aside: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Aside</p>
+main: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Main Content</p>
+footer: |-
+  <p style="border: var(--border-size-1) dashed var(--gray-3); color: var(--gray-6); padding: 1rem; max-inline-size: 100%; margin: 0;">Optional Footer</p>
-- 
GitLab


From 4d339ce9e741272ed8487ae7598d834e256cf6c4 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 3 Oct 2022 11:01:07 -0400
Subject: [PATCH 04/11] ISTWCMS-5789: removing testing code

---
 src/patterns/03-layouts/sidebar/sidebar.twig | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/patterns/03-layouts/sidebar/sidebar.twig b/src/patterns/03-layouts/sidebar/sidebar.twig
index ef67b0a..660b512 100644
--- a/src/patterns/03-layouts/sidebar/sidebar.twig
+++ b/src/patterns/03-layouts/sidebar/sidebar.twig
@@ -28,13 +28,6 @@
 
 <div class="{{ sidebar_classes }}" {{ attributes ? attributes|without('class') }}>
 
-
-  <!-- Dump code -->
-  <pre>
-    {{ dump(sidebar) }}
- </pre>
-
-
   {% if header_content %}
     <div class="{{ additional_sidebar_first_region_attributes }}">
       {{ header_content }}
-- 
GitLab


From 4fc918f6b5a44991ef6c8f83d42e7a4232e6475f Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Mon, 3 Oct 2022 11:26:26 -0400
Subject: [PATCH 05/11] ISTWCMS-5789: adding css for the responsive image
 patterns

---
 src/patterns/03-layouts/sidebar/sidebar.twig | 50 --------------------
 src/patterns/04-components/_index.scss       |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/patterns/03-layouts/sidebar/sidebar.twig b/src/patterns/03-layouts/sidebar/sidebar.twig
index 660b512..3dc023b 100644
--- a/src/patterns/03-layouts/sidebar/sidebar.twig
+++ b/src/patterns/03-layouts/sidebar/sidebar.twig
@@ -53,53 +53,3 @@
   {% endif %}
 </div>
 
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
-
-<div class="l-sidebar {{ modifier }}">
-  {% if header %}
-    <div class="l-sidebar__header">
-      {% block header %}
-        {{ header }}
-      {% endblock %}
-    </div>
-  {% endif %}
-
- {% if constrain %}
-    <div class="{{ constrain }}">
-  {% endif %}
-
-  <div class="l-sidebar__grid">
-    {% if aside %}
-      <aside class="l-sidebar__aside">
-        {% block aside %}
-          {{ aside }}
-        {% endblock %}
-      </aside>
-    {% endif %}
-
-    <div class="l-sidebar__main">
-      {% block main %}
-        {{ main }}
-      {% endblock %}
-    </div>
-  </div>
-
-  {% if constrain %}
-    </div>
-  {% endif %}
-
-  {% if footer %}
-    <div class="l-sidebar__footer">
-      {% block footer %}
-        {{ footer }}
-      {% endblock %}
-    </div>
-  {% endif %}
-</div>
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
-<!-- Ohana Chaz code -->
diff --git a/src/patterns/04-components/_index.scss b/src/patterns/04-components/_index.scss
index d00f9f6..dba99d3 100644
--- a/src/patterns/04-components/_index.scss
+++ b/src/patterns/04-components/_index.scss
@@ -43,6 +43,7 @@
 @forward 'page-title/page-title';
 @forward 'pager/pager';
 @forward 'remote-video/remote-video';
+@forward 'responsive-image/responsive-image';
 @forward 'search/search';
 @forward 'search/search--wcms-headerbar/search--wcms-headerbar';
 @forward 'site-logo/site-logo';
-- 
GitLab


From 901da4a26105af320b9ee1dd0391d76e1d7b6398 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 3 Oct 2022 14:41:07 -0400
Subject: [PATCH 06/11] ISTWCMS-5789L adding media

---
 src/patterns/03-layouts/media/_media.scss | 37 +++++++++++++++++++++++
 src/patterns/03-layouts/media/media.twig  |  8 +++++
 src/patterns/03-layouts/media/media.yml   |  6 ++++
 3 files changed, 51 insertions(+)
 create mode 100644 src/patterns/03-layouts/media/_media.scss
 create mode 100644 src/patterns/03-layouts/media/media.twig
 create mode 100644 src/patterns/03-layouts/media/media.yml

diff --git a/src/patterns/03-layouts/media/_media.scss b/src/patterns/03-layouts/media/_media.scss
new file mode 100644
index 0000000..9cf3e9f
--- /dev/null
+++ b/src/patterns/03-layouts/media/_media.scss
@@ -0,0 +1,37 @@
+// @file
+// Styles for Media Object.
+
+$media-gutter: var(--size-2);
+
+.l-media {
+  display: flex;
+  flex-direction: column;
+
+  //@include breakpoint(gesso-breakpoint(sm)) {
+  //  flex-direction: row;
+  //}
+}
+
+.l-media__object {
+  flex-basis: auto;
+  flex-grow: 0;
+  flex-shrink: 0;
+  margin: 0 $media-gutter 0 0;
+}
+
+.l-media__content {
+  flex-basis: auto;
+  flex-grow: 1;
+  flex-shrink: 1;
+}
+
+.l-media--column {
+  flex-direction: column;
+}
+
+.l-media--reversed {
+  > .l-media__object {
+    margin: 0 0 0 $media-gutter;
+    order: 1;
+  }
+}
diff --git a/src/patterns/03-layouts/media/media.twig b/src/patterns/03-layouts/media/media.twig
new file mode 100644
index 0000000..d9d87a3
--- /dev/null
+++ b/src/patterns/03-layouts/media/media.twig
@@ -0,0 +1,8 @@
+<div class="uw-media {{ modifier_classes }}" {{ attributes }}>
+  {% block content %}
+    {% if media %}
+      <div class="uw-media__object">{{ media }}</div>
+    {% endif %}
+    <div class="uw-media__content">{{ content }}</div>
+  {% endblock %}
+</div>
diff --git a/src/patterns/03-layouts/media/media.yml b/src/patterns/03-layouts/media/media.yml
new file mode 100644
index 0000000..7294803
--- /dev/null
+++ b/src/patterns/03-layouts/media/media.yml
@@ -0,0 +1,6 @@
+---
+modifier_classes: ''
+media: |-
+  <img src="http://fpoimg.com/200x150?text=Media Image">
+content: |-
+  <p>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Molestiae necessitatibus fuga provident aut.</p>
-- 
GitLab


From cd9b89165f6e3b9b3db3f8d1122724a25c7c994a Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 3 Oct 2022 14:48:52 -0400
Subject: [PATCH 07/11] ISTWCMS-5789: adding media so that it actually works

---
 src/patterns/03-layouts/_index.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/patterns/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss
index f851399..f88fc20 100644
--- a/src/patterns/03-layouts/_index.scss
+++ b/src/patterns/03-layouts/_index.scss
@@ -6,6 +6,7 @@
 @forward 'header/header';
 @forward 'layout/layout';
 @forward 'layout/layout-base';
+@forward 'media/media';
 @forward 'node/node';
 @forward 'region/region';
 @forward 'sidebar/sidebar';
-- 
GitLab


From b767c1542dd9f64212b36a40d72281ff82db870e Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Mon, 3 Oct 2022 14:49:31 -0400
Subject: [PATCH 08/11] ISTWCMS-5789: adding the core to media so that it
 actually works

---
 src/patterns/03-layouts/media/_media.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/patterns/03-layouts/media/_media.scss b/src/patterns/03-layouts/media/_media.scss
index 9cf3e9f..80ab9d3 100644
--- a/src/patterns/03-layouts/media/_media.scss
+++ b/src/patterns/03-layouts/media/_media.scss
@@ -1,6 +1,8 @@
 // @file
 // Styles for Media Object.
 
+@use '../../01-core' as *;
+
 $media-gutter: var(--size-2);
 
 .l-media {
-- 
GitLab


From 38f6dd1bcac4a7189bdc4ca7b3f761368290ef59 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Mon, 3 Oct 2022 15:19:02 -0400
Subject: [PATCH 09/11] ISTWCMS-5789: adding the css for media query and use
 the global grid gutter variable

---
 src/patterns/03-layouts/media/_media.scss | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/patterns/03-layouts/media/_media.scss b/src/patterns/03-layouts/media/_media.scss
index 80ab9d3..b058459 100644
--- a/src/patterns/03-layouts/media/_media.scss
+++ b/src/patterns/03-layouts/media/_media.scss
@@ -1,24 +1,20 @@
+@use '../../01-core' as *;
 // @file
 // Styles for Media Object.
 
-@use '../../01-core' as *;
-
-$media-gutter: var(--size-2);
-
 .l-media {
   display: flex;
   flex-direction: column;
-
-  //@include breakpoint(gesso-breakpoint(sm)) {
-  //  flex-direction: row;
-  //}
+  @media(min-width: $screen-sm) {
+    flex-direction: row;
+  }
 }
 
 .l-media__object {
   flex-basis: auto;
   flex-grow: 0;
   flex-shrink: 0;
-  margin: 0 $media-gutter 0 0;
+  margin: 0 var(--grid-gutter) 0 0;
 }
 
 .l-media__content {
@@ -33,7 +29,7 @@ $media-gutter: var(--size-2);
 
 .l-media--reversed {
   > .l-media__object {
-    margin: 0 0 0 $media-gutter;
+    margin: 0 0 0 var(--grid-gutter);
     order: 1;
   }
 }
-- 
GitLab


From 488d5dc8bf7ae80cdd7d2b20143dcfe6ee32f34b Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 4 Oct 2022 10:58:10 -0400
Subject: [PATCH 10/11] ISTWCMS-5789: fixing multi tab list for more than 3
 tabs

---
 .../multi-type-list/multi-type-list.twig      | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/patterns/04-components/multi-type-list/multi-type-list.twig b/src/patterns/04-components/multi-type-list/multi-type-list.twig
index 0a6ed6b..103891c 100644
--- a/src/patterns/04-components/multi-type-list/multi-type-list.twig
+++ b/src/patterns/04-components/multi-type-list/multi-type-list.twig
@@ -65,6 +65,41 @@
             </div>
           {% endif %}
         {% endblock %}
+
+      {% elseif loop.parent.loop.index == 4 %}
+        {% block content_area_4 %}
+          {% include '@components/multi-type-list/_multi-tab-list-include-content.twig' with {
+            'type': type,
+            'lists': lists,
+            'view_all': view_all,
+          } %}
+          {% if view_all %}
+            <div class="uw-multi-type-list__button">
+              {% include '@components/button/button.twig' with {
+                'url': view_all[type].url,
+                'text': view_all[type].text,
+              } %}
+            </div>
+          {% endif %}
+        {% endblock %}
+
+      {% elseif loop.parent.loop.index == 5 %}
+        {% block content_area_5 %}
+          {% include '@components/multi-type-list/_multi-tab-list-include-content.twig' with {
+            'type': type,
+            'lists': lists,
+            'view_all': view_all,
+          } %}
+          {% if view_all %}
+            <div class="uw-multi-type-list__button">
+              {% include '@components/button/button.twig' with {
+                'url': view_all[type].url,
+                'text': view_all[type].text,
+              } %}
+            </div>
+          {% endif %}
+        {% endblock %}
+
       {% endif %}
 
     {% endfor %}
-- 
GitLab


From 4cbfc0b1680096109975dae12bfa46aa353f63d3 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Tue, 4 Oct 2022 11:21:44 -0400
Subject: [PATCH 11/11] ISTWCMS-5789: additional logic in details pattern for
 open attribute in details print when using location info on events or other
 card footer details embeds

---
 src/patterns/04-components/details/details.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patterns/04-components/details/details.twig b/src/patterns/04-components/details/details.twig
index 5dabdab..c5e2348 100644
--- a/src/patterns/04-components/details/details.twig
+++ b/src/patterns/04-components/details/details.twig
@@ -1,4 +1,4 @@
-<details class="uw-details {{ details_classes }}" {% if details.is_open %} open{% endif %}>
+<details class="uw-details {{ details_classes }}" {% if details.is_open or is_open %} open{% endif %}>
   <summary class="details__summary">
     {% block details_summary %}
 
-- 
GitLab