From a42add84c5e2b018d6a13d70a601313454b72461 Mon Sep 17 00:00:00 2001 From: AndyEPhipps Date: Wed, 15 Apr 2026 13:34:00 +0100 Subject: [PATCH 1/3] fix: port CRcom styles over --- .../RichtextCarousel.style.js | 19 +++++++++- .../RichtextCarousel/RichtextCarousel.test.js | 36 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js b/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js index b0c4fbb3b..f8453efeb 100644 --- a/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js +++ b/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js @@ -53,7 +53,17 @@ const CarouselWrapper = styled.div` margin: 0 auto; border-radius: 20px; - ${defaultBoxShadow()} + ${defaultBoxShadow()} + + > div:first-child { + * { + margin-top: 0; + } + + h1, h2, h3 { + margin-bottom: 1.5rem; + } + } .carousel { position: relative; @@ -236,6 +246,13 @@ const CarouselWrapper = styled.div` align-items: center; justify-content: flex-start; flex-direction: column; + + .slide-copy-wrapper { + font-size: 0.9rem; + * { + font-size: inherit; + } + } } } } diff --git a/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js b/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js index e84aa0f9e..3df910d49 100644 --- a/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js +++ b/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js @@ -28,6 +28,16 @@ it('renders default padding version correctly', () => { box-shadow: rgba(0,0,0,0.15) 0px 0px 1rem; } + .c1 > div:first-child * { + margin-top: 0; + } + + .c1 > div:first-child h1, + .c1 > div:first-child h2, + .c1 > div:first-child h3 { + margin-bottom: 1.5rem; + } + .c1 .carousel { position: relative; margin: 0 auto; @@ -122,6 +132,14 @@ it('renders default padding version correctly', () => { flex-direction: column; } + .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper { + font-size: 0.9rem; + } + + .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper * { + font-size: inherit; + } + .c0 { background-color: #F4F3F5; padding: 2rem 0 2rem; @@ -285,6 +303,16 @@ it('renders custom padding + background colour version correctly', () => { box-shadow: rgba(0,0,0,0.15) 0px 0px 1rem; } + .c1 > div:first-child * { + margin-top: 0; + } + + .c1 > div:first-child h1, + .c1 > div:first-child h2, + .c1 > div:first-child h3 { + margin-bottom: 1.5rem; + } + .c1 .carousel { position: relative; margin: 0 auto; @@ -379,6 +407,14 @@ it('renders custom padding + background colour version correctly', () => { flex-direction: column; } + .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper { + font-size: 0.9rem; + } + + .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper * { + font-size: inherit; + } + .c0 { background-color: #86E4E9; padding: 4rem 0 4rem; From 161b68cee64549245d543fc85431e6606c7c2394 Mon Sep 17 00:00:00 2001 From: AndyEPhipps Date: Wed, 15 Apr 2026 13:43:02 +0100 Subject: [PATCH 2/3] Lineheight fix --- .../Organisms/RichtextCarousel/RichtextCarousel.style.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js b/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js index f8453efeb..5410ae7f8 100644 --- a/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js +++ b/src/components/Organisms/RichtextCarousel/RichtextCarousel.style.js @@ -249,8 +249,11 @@ const CarouselWrapper = styled.div` .slide-copy-wrapper { font-size: 0.9rem; + line-height: 0.9rem; + * { - font-size: inherit; + font-size: inherit; + line-height: inherit; } } } From 6059fe18de7a24ab110cb6477314e4a884cb4a42 Mon Sep 17 00:00:00 2001 From: AndyEPhipps Date: Wed, 15 Apr 2026 15:09:53 +0100 Subject: [PATCH 3/3] Update snaps --- .../Organisms/RichtextCarousel/RichtextCarousel.test.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js b/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js index 3df910d49..8e4afc4e9 100644 --- a/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js +++ b/src/components/Organisms/RichtextCarousel/RichtextCarousel.test.js @@ -134,10 +134,12 @@ it('renders default padding version correctly', () => { .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper { font-size: 0.9rem; + line-height: 0.9rem; } .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper * { font-size: inherit; + line-height: inherit; } .c0 { @@ -409,10 +411,12 @@ it('renders custom padding + background colour version correctly', () => { .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper { font-size: 0.9rem; + line-height: 0.9rem; } .c1 .carousel .richtext-carousel .carousel__slide .carousel__inner-slide .slide-copy-wrapper * { font-size: inherit; + line-height: inherit; } .c0 {