From 2611d3b7e666b9c939b6cd52f1a31362d8890d6a Mon Sep 17 00:00:00 2001 From: Martin Leblanc <m26lebla@uwaterloo.ca> Date: Fri, 26 Aug 2022 09:41:52 -0400 Subject: [PATCH] ISTWCMS-5747: css to clean up spacing in page title blocks, typo in message.twig , css for full width spacing --- src/patterns/03-layouts/block/_block.scss | 5 +++++ src/patterns/03-layouts/block/block.twig | 8 ++++---- src/patterns/03-layouts/layout/_layout.scss | 8 ++++---- src/patterns/04-components/_index.scss | 1 + .../04-components/image-gallery/_image-gallery.scss | 2 +- src/patterns/04-components/message/message.twig | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/patterns/03-layouts/block/_block.scss b/src/patterns/03-layouts/block/_block.scss index 97d7e060..9ad2d1ae 100644 --- a/src/patterns/03-layouts/block/_block.scss +++ b/src/patterns/03-layouts/block/_block.scss @@ -1,3 +1,5 @@ +@use '../../01-core' as *; + // @file // Styles for Block. @@ -9,3 +11,6 @@ .block--provider-layout-builder { margin-bottom: 0; } +.l-block--id-local-tasks-block{ + @include uw-contained-width(); +} diff --git a/src/patterns/03-layouts/block/block.twig b/src/patterns/03-layouts/block/block.twig index 44b3ca4e..a3cde7c8 100644 --- a/src/patterns/03-layouts/block/block.twig +++ b/src/patterns/03-layouts/block/block.twig @@ -1,16 +1,16 @@ {% set classes = [ - 'block l-block', - modifier ? modifier: '', + 'block', + modifier ? modifier: '', attributes ? attributes.class ]|join(' ')|trim %} {% set title_classes = [ - 'block__title l-block__title', + 'block__title', title_attributes ? title_attributes.class ]|join(' ')|trim %} {% set content_classes = [ - 'block__content l-block__content', + 'block__content', content_attributes ? content_attributes.class ]|join(' ')|trim %} diff --git a/src/patterns/03-layouts/layout/_layout.scss b/src/patterns/03-layouts/layout/_layout.scss index d8aa3e61..8ce5db03 100644 --- a/src/patterns/03-layouts/layout/_layout.scss +++ b/src/patterns/03-layouts/layout/_layout.scss @@ -58,11 +58,11 @@ } &.layout--uw-1-col{ - .block-inline-blockuw-cbl-banner-images, - .block-inline-blockuw-cbl-image, + .l-block--id-inline-blockuw-cbl-banner-images, + .l-block--id-inline-blockuw-cbl-image, .block-uw-cbl-image, - .block-inline-blockuw-cbl-remote-video, - .block-inline-blockuw-cbl-image-gallery{ + .l-block--id-inline-blockuw-cbl-remote-video, + .l-block--id-inline-blockuw-cbl-image-gallery{ @include uw-full-width-margin; .layout-builder &{ diff --git a/src/patterns/04-components/_index.scss b/src/patterns/04-components/_index.scss index e238ef83..6f6b8f61 100644 --- a/src/patterns/04-components/_index.scss +++ b/src/patterns/04-components/_index.scss @@ -39,6 +39,7 @@ @forward 'mobile-menu/mobile-menu'; @forward 'mobile-menu-button/mobile-menu-button'; @forward 'multi-type-list/multi-type-list'; +@forward 'page-title/page-title'; @forward 'remote-video/remote-video'; @forward 'search/search'; @forward 'search/search--wcms-headerbar/search--wcms-headerbar'; diff --git a/src/patterns/04-components/image-gallery/_image-gallery.scss b/src/patterns/04-components/image-gallery/_image-gallery.scss index ac2dabae..490d42d4 100644 --- a/src/patterns/04-components/image-gallery/_image-gallery.scss +++ b/src/patterns/04-components/image-gallery/_image-gallery.scss @@ -164,7 +164,7 @@ $size-xlarge: 7; position: relative; width: 100%; a { - background: var(--uw-black); + background: transparent; box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19); display: block; height: 100%; diff --git a/src/patterns/04-components/message/message.twig b/src/patterns/04-components/message/message.twig index 8ef5c2c3..af79b3e7 100644 --- a/src/patterns/04-components/message/message.twig +++ b/src/patterns/04-components/message/message.twig @@ -16,7 +16,7 @@ attributes ? additional_attributes.class ]|join(' ')|trim %} -<div {% if type == 'error' %} role="alert" {% else %} role="contentinfo" {% endif %} {% if heading %}aria-label="{{ heading }}"{% endif %} class="{{messages_classes}}" {{ attributes ? attributes|without('class') }}>> +<div {% if type == 'error' %} role="alert" {% else %} role="contentinfo" {% endif %} {% if heading %}aria-label="{{ heading }}"{% endif %} class="{{messages_classes}}" {{ attributes ? attributes|without('class') }}> {% if messages|length > 1 %} <h2 class="visually-hidden">{{ heading }}</h2> <ul class="message__list"> -- GitLab