Skip to content

Commit

Permalink
Fixing code conflicts with #3053
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Clayton committed Dec 9, 2024
1 parent e5538ef commit fd9f684
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions libs/blocks/carousel/carousel.css
Original file line number Diff line number Diff line change
Expand Up @@ -373,47 +373,38 @@ html[dir="rtl"] .carousel-slides .section.carousel-slide {
width: unset;
}

.carousel.video-fill .carousel-slide > div p > video,
.carousel .carousel-slide.video-fill > div p > video {
width: 100%;
height: auto;
}

.carousel:is(.rounded-corners, .m-rounded-corners) .carousel-slide,
.carousel:is(.rounded-corners, .m-rounded-corners) .carousel-slide > div :is(p > picture img, p > video, p > .milo-video) {
.carousel:is(.rounded-corners, .m-rounded-corners) .carousel-slide > div :is(p > picture img, p > video, p > .milo-video, p > .video-holder video) {
border-radius: var(--m-rounded-corners);
}

.carousel[class*='rounded-corners'] .carousel-slide,
.carousel[class*='rounded-corners'] .carousel-slide > div :is(p > video, p > .milo-video) {
.carousel[class*='rounded-corners'] .carousel-slide > div :is(p > video, p > .milo-video, p > .video-holder video) {
overflow: hidden;
}

.carousel.s-rounded-corners .carousel-slide,
.carousel.s-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video) {
.carousel.s-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video, p > .video-holder video) {
border-radius: var(--s-rounded-corners);
}

.carousel.l-rounded-corners .carousel-slide,
.carousel.l-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video) {
.carousel.l-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video, p > .video-holder video) {
border-radius: var(--l-rounded-corners);
}

.carousel.full-rounded-corners .carousel-slide,
.carousel.full-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video) {
.carousel.full-rounded-corners .carousel-slide > div :is(p > picture img, p > video, p > .milo-video, p > .video-holder video) {
border-radius: var(--full-rounded-corners);
}

.carousel[class*='rounded-corners'] .carousel-slide {
overflow: hidden;
}

.carousel .carousel-slide > div p :is(.video-holder, video) {
.carousel.video-fill .carousel-slide > div p :is(.video-holder, video),
.carousel .carousel-slide.video-fill > div p :is(.video-holder, video) {
width: 100%;
height: auto;
}

.carousel[class*='rounded-corners'] .carousel-slide > div :is(p):has(> video, > picture, > .milo-video, > .modal-img-link) {
.carousel[class*='rounded-corners'] .carousel-slide > div :is(p):has(> video, > picture, > .milo-video, > .modal-img-link, > .video-holder) {
margin-top: 0;
margin-bottom: 0;
line-height: 0;
Expand Down

0 comments on commit fd9f684

Please sign in to comment.