diff --git a/src/components/messaging-and-feedback/OakInlineBanner/OakInlineBanner.tsx b/src/components/messaging-and-feedback/OakInlineBanner/OakInlineBanner.tsx index 6a7236a7c..17efc2e25 100644 --- a/src/components/messaging-and-feedback/OakInlineBanner/OakInlineBanner.tsx +++ b/src/components/messaging-and-feedback/OakInlineBanner/OakInlineBanner.tsx @@ -136,7 +136,6 @@ export type OakInlineBannerVariantProps = { loadingSpinnerDimensions: Partial; heading: Partial; closeButtonWrapper?: Partial; - ctaWrapper?: Partial; flexDirection: FlexStyleProps["$flexDirection"]; bannerPadding: PaddingStyleProps["$pa"]; textContentGap?: FlexStyleProps["$gap"]; @@ -155,9 +154,6 @@ export const bannerVariants: OakInlineBannerVariantProps = { heading: { $font: ["heading-7"], }, - ctaWrapper: { - $mt: "spacing-12", - }, flexDirection: "row", bannerPadding: "spacing-16", textContentGap: "spacing-4", @@ -173,9 +169,6 @@ export const bannerVariants: OakInlineBannerVariantProps = { heading: { $font: ["heading-6"], }, - ctaWrapper: { - $mt: "spacing-8", - }, closeButtonWrapper: { $position: "absolute", $top: "spacing-0", @@ -294,29 +287,32 @@ export const OakInlineBanner = ({ )} - {title && ( - - {title} - - )} - - {message} - - {cta && ( - - {cta} - - )} + + {title && ( + + {title} + + )} + + {message} + + + {cta && {cta}} diff --git a/src/components/messaging-and-feedback/OakInlineBanner/__snapshots__/OakInlineBanner.test.tsx.snap b/src/components/messaging-and-feedback/OakInlineBanner/__snapshots__/OakInlineBanner.test.tsx.snap index 12ff9ec6b..459feb665 100644 --- a/src/components/messaging-and-feedback/OakInlineBanner/__snapshots__/OakInlineBanner.test.tsx.snap +++ b/src/components/messaging-and-feedback/OakInlineBanner/__snapshots__/OakInlineBanner.test.tsx.snap @@ -78,7 +78,7 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` font-family: --var(google-font),Lexend,sans-serif; } -.c22 { +.c23 { font-family: --var(google-font),Lexend,sans-serif; font-weight: 300; font-size: 1rem; @@ -89,12 +89,7 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` letter-spacing: -0.005rem; } -.c23 { - margin-top: 0.75rem; - font-family: --var(google-font),Lexend,sans-serif; -} - -.c26 { +.c27 { padding-left: 0.25rem; display: inline-block; font-family: --var(google-font),Lexend,sans-serif; @@ -185,6 +180,24 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` } .c20 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + -webkit-align-items: start; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: start; + -webkit-order: 1; + -ms-flex-order: 1; + order: 1; + gap: 1.5rem; +} + +.c21 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -200,12 +213,19 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` -webkit-justify-content: center; -ms-flex-pack: center; justify-content: center; - -webkit-order: 1; - -ms-flex-order: 1; - order: 1; gap: 0.25rem; } +.c24 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-shrink: 0; + -ms-flex-negative: 0; + flex-shrink: 0; +} + .c18 { font-family: --var(google-font),Lexend,sans-serif; font-weight: 600; @@ -217,7 +237,7 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` letter-spacing: 0.0115rem; } -.c25 { +.c26 { font-family: --var(google-font),Lexend,sans-serif; } @@ -246,7 +266,7 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` object-fit: contain; } -.c29 { +.c30 { object-fit: contain; } @@ -298,7 +318,7 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` background: transparent; } -.c21 { +.c22 { font-family: --var(google-font),Lexend,sans-serif; font-weight: 600; font-size: 1rem; @@ -309,14 +329,14 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` letter-spacing: 0.0115rem; } -.c28 { +.c29 { width: 1.25em; min-width: 1.25em; height: 1.25em; min-height: 1.25em; } -.c24 { +.c25 { display: inline; -webkit-align-items: center; -webkit-box-align: center; @@ -340,49 +360,49 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` overflow-wrap: break-word; } -.c24 .c27 { +.c25 .c28 { -webkit-filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); display: inline-block; vertical-align: text-top; } -.c24:focus-visible { +.c25:focus-visible { box-shadow: 0 0 0 0.125rem rgba(255,229,85,100%), 0 0 0 0.3rem rgba(87,87,87,100%); } -.c24:visited { +.c25:visited { color: #222222; } -.c24:visited .c27 { +.c25:visited .c28 { -webkit-filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); } -.c24:active { +.c25:active { color: #222222; outline: 1px solid #222222; } -.c24:active .c27 { +.c25:active .c28 { -webkit-filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); } -.c24[disabled] { +.c25[disabled] { cursor: not-allowed; color: #808080; } -.c24[disabled] .c27 { +.c25[disabled] .c28 { -webkit-filter: invert(54%) sepia(0%) saturate(38%) hue-rotate(176deg) brightness(92%) contrast(91%); filter: invert(54%) sepia(0%) saturate(38%) hue-rotate(176deg) brightness(92%) contrast(91%); } @media (hover:hover) { - .c24:hover, - .c24:visited:hover { + .c25:hover, + .c25:visited:hover { color: #222222; -webkit-text-decoration: underline; text-decoration: underline; @@ -390,8 +410,8 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = ` text-decoration-thickness: 18%; } - .c24:hover .c27, - .c24:visited:hover .c27 { + .c25:hover .c28, + .c25:visited:hover .c28 { -webkit-filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); filter: invert(10%) sepia(1%) saturate(236%) hue-rotate(314deg) brightness(95%) contrast(91%); } @@ -468,38 +488,42 @@ exports[`OakInlineBanner matches snapshot for banner with title 1`] = `
-

- Information -

- Lorem ipsum dolor sit amet consectetur. Arcu proin rhoncus eget aliquet. +

+ Information +

+
+ Lorem ipsum dolor sit amet consectetur. Arcu proin rhoncus eget aliquet. +
Link
-

- Information -

- Lorem ipsum dolor sit amet consectetur. Arcu proin rhoncus eget aliquet. +

+ Information +

+
+ Lorem ipsum dolor sit amet consectetur. Arcu proin rhoncus eget aliquet. +
Link
Choose subject for KS4 units
@@ -507,23 +540,23 @@ exports[`OakDownloadsJourneyChildSubjectTierSelector matches snapshot 1`] = ` class="c0" >
Choose learning tier for KS4 units
@@ -597,23 +630,23 @@ exports[`OakDownloadsJourneyChildSubjectTierSelector matches snapshot 1`] = ` class="c0" >