diff --git a/src/patterns/03-layouts/layout/_layout.scss b/src/patterns/03-layouts/layout/_layout.scss index 404a9874225a04dc2cca97b7d57337975178c73f..de63e0f41ce1b961db1f132ff458aa7915e17864 100644 --- a/src/patterns/03-layouts/layout/_layout.scss +++ b/src/patterns/03-layouts/layout/_layout.scss @@ -654,11 +654,19 @@ } } } +// Set default spacing to match old block margin if no classes +.layout.layout--uw-1-col { + &:not(.uw-section-spacing--default, .uw-section-spacing--none, .uw-section-spacing--75, .uw-section-spacing--50, .uw-section-spacing--25) { + margin-bottom: var(--section-margin); + &:last-of-type{ + margin-bottom: 0; + } + } +} .uw-section-has-full-width .layout.layout--uw-1-col{ overflow: hidden; } - .uw-full-width.uw-section-spacing--none.uw-section-separator--bottom:has(img){ padding-bottom: 0; } diff --git a/src/patterns/04-components/card/card--node/_card--node.scss b/src/patterns/04-components/card/card--node/_card--node.scss index a670ef712999e7a0088dd5bef58391d2a5ee6d51..66bea6421ced1ceebb71880717b16e4a650a045e 100644 --- a/src/patterns/04-components/card/card--node/_card--node.scss +++ b/src/patterns/04-components/card/card--node/_card--node.scss @@ -10,11 +10,17 @@ > .card__header, > .card__footer { margin: 0 auto; - max-width: var(--layout-max-width); + @include uw-contained-width(var(--layout-max-width-narrow)); + @media(min-width: $screen-xl) { + @include uw-contained-width(var(--layout-max-width)); + } } .uw-node__with-media &{ > .card__header { padding: 0; + &.uw-node__with-media{ + padding: var(--size-2) 0; + } } } .uw-node__without-media & { @@ -58,13 +64,9 @@ .uw-node__with-media & { .card__header { &.uw-node__with-media{ - padding: var(--size-2); - @media(min-width: $screen-xl) { - padding: var(--size-2) 0; - } + padding: var(--size-2) 0; } } - .card__featured-image{ align-items: center; background-position: center center; @@ -246,10 +248,7 @@ padding: var(--size-2) 0; } &.uw-node__with-media{ - padding: var(--size-2); - @media(min-width: $screen-xl) { - padding: var(--size-2) 0; - } + padding: var(--size-2) 0; } } .card__footer,