Merge branch 'main' into fix/card-group_wrong-styles

carbon-design-system · Nov 27, 2024 · 851ac19 · 851ac19
2 parents 569f59c + 4a7c1d1
commit 851ac19
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/styles/scss/components/callout-with-media/_callout-with-media.scss b/packages/styles/scss/components/callout-with-media/_callout-with-media.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2016, 2023
+// Copyright IBM Corp. 2016, 2024
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
@@ -96,6 +96,8 @@
   :host(#{$c4d-prefix}-callout-with-media-video)
     ::slotted(#{$c4d-prefix}-video-player) {
     @extend :host(#{$c4d-prefix}-callout-caption);
+
+    margin-block-end: 0;
   }
 
   :host(#{$c4d-prefix}-callout-with-media-image[color-scheme='inverse'])
@@ -159,7 +161,7 @@
   .#{$prefix}--callout-with-media
     .#{$prefix}--callout__content
     .#{$prefix}--content-block {
-    padding-block-end: $spacing-10;
+    padding-block-end: $spacing-07;
   }
 
   :host(#{$c4d-prefix}-callout-with-media-image),

diff --git a/packages/styles/scss/components/feature-card/_feature-card.scss b/packages/styles/scss/components/feature-card/_feature-card.scss
@@ -125,6 +125,7 @@ $feature-flags: (
     ::slotted([slot='image']),
     #{$c4d-prefix}-image {
       z-index: 0;
+      block-size: 100%;
 
       // Opacity is adjusted on hover. See above.
       &::before {

diff --git a/packages/styles/scss/components/feature-section/_feature-section.scss b/packages/styles/scss/components/feature-section/_feature-section.scss
@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * Copyright IBM Corp. 2016, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -121,6 +121,7 @@
 
     ::slotted(#{$c4d-prefix}-image) {
       overflow: hidden;
+      block-size: 100%;
 
       @include breakpoint(sm) {
         block-size: aspect-ratio(1, 1);