Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/merge-alpha-ma…

…sthead-to-v2-main
carbon-design-system · Oct 11, 2023 · d3c80d7 · d3c80d7
2 parents bf424c4 + f3fb8b8
commit d3c80d7
Show file tree

Hide file tree

Showing 11 changed files with 292 additions and 287 deletions.
diff --git a/docs/dotcom-v2-migration.md b/docs/dotcom-v2-migration.md
@@ -74,7 +74,7 @@ For Carbon v11 migration guidance, see their
 
 ### Card
 
-- `<dds-card-footer>` has `icon-placement` property has been removed
+- `<c4d-card-footer>`'s `icon-placement` property has been removed
 - Removed `border` property, clickable cards inherit the Carbon v11 experimental
   tile border style
 - New `aspect-ratio` property with '1:1', '2:1', '3:2', '4:3', and '16:9' as

diff --git a/packages/styles/scss/components/card/_card.scss b/packages/styles/scss/components/card/_card.scss
@@ -23,6 +23,7 @@
 @mixin card {
   .#{$prefix}--card,
   :host(#{$c4d-prefix}-card),
+  :host(#{$c4d-prefix}-region-item) .#{$prefix}--link,
   :host(#{$c4d-prefix}-card-cta),
   :host(#{$c4d-prefix}-card-in-card),
   :host(#{$c4d-prefix}-card-group-item),
@@ -34,6 +35,7 @@
 
   .#{$prefix}--card,
   :host(#{$c4d-prefix}-card),
+  :host(#{$c4d-prefix}-region-item) .#{$prefix}--link,
   :host(#{$c4d-prefix}-link-list-item-card),
   :host(#{$c4d-prefix}-card-group-item),
   :host(#{$c4d-prefix}-card-group-item) .#{$prefix}--card,
@@ -760,7 +762,8 @@
     }
   }
 
-  :host(#{$c4d-prefix}-card[disabled]) {
+  :host(#{$c4d-prefix}-card[disabled]),
+  :host(#{$c4d-prefix}-region-item[disabled]) {
     .#{$prefix}--card {
       cursor: not-allowed;
     }