From cc06c8d78182e2aa1bc331897a6f2bcdfae68859 Mon Sep 17 00:00:00 2001 From: Glenn Barr Date: Mon, 17 Jul 2023 10:25:18 +0100 Subject: [PATCH 1/4] Ensure contextual links in the footer are excluded from ul styling --- css/components/footer.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/components/footer.css b/css/components/footer.css index dd827f0..31440b4 100644 --- a/css/components/footer.css +++ b/css/components/footer.css @@ -14,7 +14,7 @@ } .microsite-footer__logos .field__items, -.microsite-footer__housekeeping ul, +.microsite-footer__housekeeping ul:not(.contextual-links), .microsite-footer__copyright, .microsite-footer__powered_by { display: flex; @@ -37,7 +37,7 @@ margin-top: var(--spacing); } -.microsite-footer__housekeeping ul { +.microsite-footer__housekeeping ul:not(.contextual-links) { list-style-type: none; } From 47e3ff60a2e8f876d475502badc74f18ae3c7679 Mon Sep 17 00:00:00 2001 From: Glenn Barr Date: Mon, 17 Jul 2023 10:28:04 +0100 Subject: [PATCH 2/4] Allow header elements to collapse to column --- css/components/header.css | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/css/components/header.css b/css/components/header.css index af35ceb..e4275ec 100644 --- a/css/components/header.css +++ b/css/components/header.css @@ -30,9 +30,17 @@ .microsite-header__main { display: flex; + flex-direction: column; gap: var(--spacing); } +@media screen and (min-width: 768px) { + .microsite-header__main { + flex-direction: row; + align-items: var(--header-items-alignment); + } +} + .microsite-header__logo { max-width: var(--header-logo-width); } @@ -80,8 +88,10 @@ text-decoration: underline; } -.microsite-header__off-canvas { - margin-left: auto; +@media screen and (min-width: 768px) { + .microsite-header__off-canvas { + margin-left: auto; + } } @media screen and (min-width: 768px) { @@ -96,10 +106,6 @@ font-weight: var(--site-name-font-weight); } -.microsite-header__main { - align-items: var(--header-items-alignment); -} - .block-group-content-menulgms-main-menu { font-size: var(--menu-main-font-size); font-weight: var(--menu-main-font-weight); From aa7d57ab6a2d02a751970dd7242d4a61a6d05a9c Mon Sep 17 00:00:00 2001 From: Glenn Barr Date: Mon, 17 Jul 2023 14:45:54 +0100 Subject: [PATCH 3/4] Add @container to events listing for responsiveness --- css/components/view-events.css | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/css/components/view-events.css b/css/components/view-events.css index 603a25c..d220583 100644 --- a/css/components/view-events.css +++ b/css/components/view-events.css @@ -40,23 +40,32 @@ margin-bottom: 0; } +.view-localgov-events-listing { + container-type: inline-size; + container-name: events-listing; +} + .view-localgov-events-listing .views-row { display: grid; - grid-template-columns: min-content 1fr; - grid-auto-rows: auto; - gap: 0 var(--spacing); + gap: var(--spacing); } -.view-localgov-events-listing .views-row > * { - grid-column: 2; -} +@container events-listing (min-width: 35rem) { + .view-localgov-events-listing .views-row { + display: grid; + gap: 0 var(--spacing); + } -.view-localgov-events-listing .views-row .views-field-localgov-event-image { - grid-row: 1 / span 4; - grid-column: 1; - order: -1; -} + .view-localgov-events-listing .views-row > * { + grid-column: 2; + } + + .view-localgov-events-listing .views-row .views-field-localgov-event-image { + grid-row: 1 / span 4; + grid-column: 1; + } -.view-localgov-events-listing .views-row .views-field-localgov-event-image .field-content { - width: 200px; + .view-localgov-events-listing .views-row .views-field-localgov-event-image .field-content { + width: 200px; + } } From c4bd4d58bb39fa7eae87b3c261274bf5f5795a1b Mon Sep 17 00:00:00 2001 From: Glenn Barr Date: Mon, 17 Jul 2023 15:06:10 +0100 Subject: [PATCH 4/4] Reduce specificity in event listing css --- css/components/view-events.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/components/view-events.css b/css/components/view-events.css index d220583..cdc02bf 100644 --- a/css/components/view-events.css +++ b/css/components/view-events.css @@ -56,16 +56,16 @@ gap: 0 var(--spacing); } - .view-localgov-events-listing .views-row > * { + .views-row > * { grid-column: 2; } - .view-localgov-events-listing .views-row .views-field-localgov-event-image { + .views-row .views-field-localgov-event-image { grid-row: 1 / span 4; grid-column: 1; } - .view-localgov-events-listing .views-row .views-field-localgov-event-image .field-content { + .views-row .views-field-localgov-event-image .field-content { width: 200px; } }