diff --git a/src/patterns/01-core/elements/_option.scss b/src/patterns/01-core/elements/_option.scss index ad161da6fff0a79441eea83bc50e3b66b2e873ec..603e467309a46598796a1bf5b87a8ededc4f2e0b 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 0ab4b54d31a24fb98dff09eed72fd83a4a821ab4..29cf29e3753e4706008abccb2f1ac27c6294e048 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 e6c8ff2a7633cf6cfabd7f6d86bd87e1ab551a91..506c74330b9b3dd527ce020efb1c55dbe995ebb7 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/03-layouts/_index.scss b/src/patterns/03-layouts/_index.scss index 70e40923db7169d2116dc73a3c7c4786ea61bc1d..f88fc2045da32ae28d26bd5dc0c2a588379d8ced 100644 --- a/src/patterns/03-layouts/_index.scss +++ b/src/patterns/03-layouts/_index.scss @@ -6,7 +6,9 @@ @forward 'header/header'; @forward 'layout/layout'; @forward 'layout/layout-base'; +@forward 'media/media'; @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/media/_media.scss b/src/patterns/03-layouts/media/_media.scss new file mode 100644 index 0000000000000000000000000000000000000000..b058459e68af49b916a0cd4612fa0fbc8aa549ce --- /dev/null +++ b/src/patterns/03-layouts/media/_media.scss @@ -0,0 +1,35 @@ +@use '../../01-core' as *; +// @file +// Styles for Media Object. + +.l-media { + display: flex; + flex-direction: column; + @media(min-width: $screen-sm) { + flex-direction: row; + } +} + +.l-media__object { + flex-basis: auto; + flex-grow: 0; + flex-shrink: 0; + margin: 0 var(--grid-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 var(--grid-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 0000000000000000000000000000000000000000..d9d87a3ee5ca16aff409f939e1f26a38dd2a6f43 --- /dev/null +++ b/src/patterns/03-layouts/media/media.twig @@ -0,0 +1,8 @@ +
+ {% block content %} + {% if media %} +
{{ media }}
+ {% endif %} +
{{ content }}
+ {% endblock %} +
diff --git a/src/patterns/03-layouts/media/media.yml b/src/patterns/03-layouts/media/media.yml new file mode 100644 index 0000000000000000000000000000000000000000..72948032bca6181388c80a1d1fd9e3e2d08a3ac7 --- /dev/null +++ b/src/patterns/03-layouts/media/media.yml @@ -0,0 +1,6 @@ +--- +modifier_classes: '' +media: |- + +content: |- +

Lorem, ipsum dolor sit amet consectetur adipisicing elit. Molestiae necessitatibus fuga provident aut.

diff --git a/src/patterns/03-layouts/sidebar/_sidebar.scss b/src/patterns/03-layouts/sidebar/_sidebar.scss new file mode 100644 index 0000000000000000000000000000000000000000..cca1ea42a95bd0395fa7a03279526b68dc05a6a2 --- /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 0000000000000000000000000000000000000000..3dc023bc43f065c9472e3a7ae17eaa654860ee59 --- /dev/null +++ b/src/patterns/03-layouts/sidebar/sidebar.twig @@ -0,0 +1,55 @@ + +{% 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%} + + + diff --git a/src/patterns/03-layouts/sidebar/sidebar.yml b/src/patterns/03-layouts/sidebar/sidebar.yml new file mode 100644 index 0000000000000000000000000000000000000000..bbfd05167a6f79a48ab1d54a3bc5c6fd2fe668a2 --- /dev/null +++ b/src/patterns/03-layouts/sidebar/sidebar.yml @@ -0,0 +1,11 @@ +--- +modifier: '' +constrain: '' +header: |- +

Optional Header

+aside: |- +

Optional Aside

+main: |- +

Main Content

+footer: |- +

Optional Footer

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 0000000000000000000000000000000000000000..6c1d5d37f0e5cc0d7ad4742fc71dcd1bb84b8a5b --- /dev/null +++ b/src/patterns/03-layouts/sidebar/sidebar~right.yml @@ -0,0 +1,11 @@ +--- +modifier: 'l-sidebar--right' +constrain: '' +header: |- +

Optional Header

+aside: |- +

Optional Aside

+main: |- +

Main Content

+footer: |- +

Optional Footer

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 817a9862431ca0c6d7826fa9d9cd62134ae262b2..8102abf5fb0b41bcc5dd794df9a336f5d7275705 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/_index.scss b/src/patterns/04-components/_index.scss index d00f9f6b8f708092a812eaf229ba7f8698782b28..dba99d369ce55d78f382c64524a4c7726c6dbc6d 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'; 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 cb31f2fd767e0b95bd5e3e83ee277784ecb57e3b..dbcf5e876b340d32fab9d9c301180028923d3576 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/details/details.twig b/src/patterns/04-components/details/details.twig index 5dabdab5a3257e499f67fdee2cd2cb6845714d3d..c5e23480545b455b87035b283255caccc39af867 100644 --- a/src/patterns/04-components/details/details.twig +++ b/src/patterns/04-components/details/details.twig @@ -1,4 +1,4 @@ -
+
{% block details_summary %} diff --git a/src/patterns/04-components/filters/_filters.scss b/src/patterns/04-components/filters/_filters.scss index a7383172b6ac6ab20e7fc8a9b00bb0c6d5012d7a..d643437fe534aaa7378751b50319b7375f5595a9 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 { diff --git a/src/patterns/04-components/label/label.twig b/src/patterns/04-components/label/label.twig index 4d11ae3f0a27702273c986b060d730bb5809fbf3..787662a98cbd07ca7877ff934f423bfcbcfd85b1 100644 --- a/src/patterns/04-components/label/label.twig +++ b/src/patterns/04-components/label/label.twig @@ -1 +1 @@ -{{ label }} +{{ label }}: 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 0a6ed6b9a785e41b3522c8cacace747997ae50a4..103891c47613ba1e3fbfba076f0ae36a927d3232 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 @@ {% 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 %} +
+ {% include '@components/button/button.twig' with { + 'url': view_all[type].url, + 'text': view_all[type].text, + } %} +
+ {% 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 %} +
+ {% include '@components/button/button.twig' with { + 'url': view_all[type].url, + 'text': view_all[type].text, + } %} +
+ {% endif %} + {% endblock %} + {% endif %} {% endfor %}