Merge branch 'main' into card-group-item-inverse-color-scheme

carbon-design-system · Dec 3, 2024 · 7e72e2a · 7e72e2a
2 parents 365638e + 41999ed
commit 7e72e2a
Show file tree

Hide file tree

Showing 24 changed files with 162 additions and 90 deletions.
diff --git a/.github/workflows/automerge-mastheadv2.yml b/.github/workflows/automerge-mastheadv2.yml
diff --git a/.github/workflows/e2e-integration.yml b/.github/workflows/e2e-integration.yml
@@ -2,7 +2,7 @@ name: e2e-integration
 
 on:
   push:
-    branches: [ main, release/v2*, feat/masthead-v2, feat/masthead-v2-dev ]
+    branches: [ main, release/v2* ]
   schedule:
     - cron: '0 20 * * 1-5'
 

diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.16.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-29)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
+# [2.16.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-25)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
 ## [2.15.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-services

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services",
   "description": "Carbon for IBM.com Services",
-  "version": "2.15.1",
+  "version": "2.16.0-rc.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/ibmdotcom-utilities": "2.15.1",
+    "@carbon/ibmdotcom-utilities": "2.16.0-rc.1",
     "@ibm/telemetry-js": "^1.5.0",
     "axios": "^1.6.8",
     "marked": "^4.0.10",

diff --git a/packages/styles/CHANGELOG.md b/packages/styles/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.16.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-29)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-styles
+
+
+
+
+
+# [2.16.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-25)
+
+
+### Bug Fixes
+
+* **leadspace:** in storybook adding long copy to copy knob led to button being clipped away ([#12117](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12117)) ([86647b3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/86647b30da9c503e303231e4e3954da745d8f4de))
+* **toc:** alignment issues ([#12118](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12118)) ([5908e7c](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/5908e7cb45c305452e9d377f91fc5304664c0739))
+
+
+
+
+
 ## [2.15.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)
 
 

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-styles",
   "description": "Carbon for IBM.com Styles",
-  "version": "2.15.1",
+  "version": "2.16.0-rc.1",
   "license": "Apache-2.0",
   "main": "dist/ibm-dotcom-styles.min.css",
   "module": "src/scss",

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);

diff --git a/packages/styles/scss/components/footer/_footer.scss b/packages/styles/scss/components/footer/_footer.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.
@@ -112,7 +112,7 @@
 
   :host(#{$c4d-prefix}-footer-nav-item),
   :host(#{$c4d-prefix}-legal-nav-item),
-  :host(#{$c4d-prefix}-legal-nav-cookie-preferences-placeholder) div {
+  :host(#{$c4d-prefix}-legal-nav-cookie-preferences-placeholder) {
     @include theme($g100, feature-flag-enabled('enable-css-custom-properties'));
 
     display: list-item;
@@ -142,6 +142,12 @@
     }
   }
 
+  :host(#{$c4d-prefix}-legal-nav-cookie-preferences-placeholder) {
+    .#{$prefix}--footer__link.#{$prefix}--link {
+      cursor: pointer;
+    }
+  }
+
   :host(#{$c4d-prefix}-legal-nav) {
     @include theme($g100, feature-flag-enabled('enable-css-custom-properties'));
 
@@ -220,7 +226,7 @@
         @include make-container;
       }
     }
-    .#{$prefix}--adjunct-links__container--hidden {
+    .#{$c4d-prefix}--adjunct-links__container--hidden {
       display: none;
     }
   }

diff --git a/packages/styles/scss/components/footer/_legal-nav.scss b/packages/styles/scss/components/footer/_legal-nav.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.
@@ -198,7 +198,7 @@
   }
 
   :host(#{$c4d-prefix}-legal-nav-item),
-  :host(#{$c4d-prefix}-legal-nav-cookie-preferences-placeholder) div,
+  :host(#{$c4d-prefix}-legal-nav-cookie-preferences-placeholder),
   .#{$prefix}--legal-nav__list-item {
     padding: $spacing-03 0 0 0;
     margin-inline-end: $spacing-07;

diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.16.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-29)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
+# [2.16.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-25)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
 ## [2.15.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-utilities

diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-utilities",
   "description": "Carbon for IBM.com Utilities",
-  "version": "2.15.1",
+  "version": "2.16.0-rc.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/utilities/src/utilities/settings/settings.js b/packages/utilities/src/utilities/settings/settings.js
@@ -12,10 +12,10 @@
  * @type {object} Settings object
  * @property {string} [stablePrefix=c4d] stable prefix
  * @property {string} [prefix=cds] core Carbon prefix
- * Carbon for IBM.com v2.15.1',
+ * Carbon for IBM.com v2.16.0',
  */
 const settings = {
-  version: 'Carbon for IBM.com v2.15.1',
+  version: 'Carbon for IBM.com v2.16.0',
   stablePrefix: 'c4d',
   prefix: 'cds',
 };

diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.16.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-29)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-web-components
+
+
+
+
+
+# [2.16.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-25)
+
+
+### Bug Fixes
+
+* **build:** update package import paths with .js ext ([#12110](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12110)) ([1c28902](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/1c289020dbf3a76352576a3ebed6be97f124102c)), closes [#12109](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12109)
+* **locale-search:** fix class fields error for inputTimeout ([#12112](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12112)) ([ec54fbe](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/ec54fbe1ef16cd9941e3ed1ccf67cfa8f2268008)), closes [#12087](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12087) [#12088](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12088)
+* **masthead-l1:** set default active item based on host & pathname ([#12106](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12106)) ([37166c0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/37166c0f4cab125e274a7b3046a5d04e4c859c50))
+* **megamenu-tab:** change default value override method ([#12088](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12088)) ([5eb3f7f](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/5eb3f7f39ba9e4b9479ae9ea5e621a2f5f2ffebb)), closes [#12087](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12087)
+* **tile:** add a knob to have deterministic random in label and headline ([#12107](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12107)) ([eeaad62](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/eeaad6274e6e1c2d79f2f2900e78213a5d1469d8))
+* **tile:** avoid deprecated c4d-tag-group ([#12115](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12115)) ([4c3b9d0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/4c3b9d0b1c579a08ce7865dc8c5b7ca60f79a8ac))
+
+
+### Features
+
+* **countdown:** add components ([#12099](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12099)) ([27bf4a3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/27bf4a3322d833a1430b2518c28b218084254798))
+* **promo-banner:** add components ([#12100](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12100)) ([417143c](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/417143c26cc42162027874bfffb269d850c7f7d5))
+* **star-rating:** new component ([#12102](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12102)) ([dfb0605](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/dfb06051bb2323a52da96ade6bc0ff3ea66d187a))
+* **tile, tile-group:** add components ([#12091](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12091)) ([f728f30](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/f728f30939e5c626867b1653f8be7b137f91f798))
+
+
+
+
+
 ## [2.15.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-11-13)
 
 

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/ibmdotcom-web-components",
-  "version": "2.15.1",
+  "version": "2.16.0-rc.1",
   "description": "Carbon for IBM.com Web Components",
   "license": "Apache-2.0",
   "exports": {
@@ -92,9 +92,9 @@
     "cypress:verify": "cypress verify"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "2.15.1",
-    "@carbon/ibmdotcom-styles": "2.15.1",
-    "@carbon/ibmdotcom-utilities": "2.15.1",
+    "@carbon/ibmdotcom-services": "2.16.0-rc.1",
+    "@carbon/ibmdotcom-styles": "2.16.0-rc.1",
+    "@carbon/ibmdotcom-utilities": "2.16.0-rc.1",
     "@carbon/layout": "11.27.0",
     "@carbon/motion": "11.22.0",
     "@carbon/styles": "1.65.0",

diff --git a/packages/web-components/src/components/card/card.ts b/packages/web-components/src/components/card/card.ts
@@ -401,7 +401,6 @@ class C4DCard extends CTAMixin(StableSelectorMixin(CDSLink)) {
     }
 
     if (this._hasPictogram) {
-      this.onclick = () => window.open(this.href, '_self');
       this.setAttribute('pictogram', '');
     } else {
       this.removeAttribute('pictogram');

diff --git a/packages/web-components/src/components/content-block-segmented/content-block-segmented.scss b/packages/web-components/src/components/content-block-segmented/content-block-segmented.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2020, 2023
+// Copyright IBM Corp. 2020, 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.
@@ -45,7 +45,7 @@
   }
 
   ::slotted([slot='footer']) {
-    margin-block-start: $spacing-07;
+    margin-inline: 0;
   }
 }
 

diff --git a/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts b/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts
@@ -96,7 +96,7 @@ export const Large = (args) => {
       </c4d-image>
       <c4d-card-eyebrow>${eyebrow}</c4d-card-eyebrow>
       <c4d-card-heading>${heading}</c4d-card-heading>
-      ${copy && html`<p></p>`}
+      ${copy ? html`<p>${copy}</p>` : ''}
       <c4d-feature-card-footer> </c4d-feature-card-footer>
     </c4d-feature-card>
   `;

diff --git a/packages/web-components/src/components/footer/footer-composite.ts b/packages/web-components/src/components/footer/footer-composite.ts
@@ -321,6 +321,7 @@ class C4DFooterComposite extends MediaQueryMixin(
             slot="${slot}"
             trigger-content="${languageSelectorLabel}"
             label-text="${languageSelectorLabel}"
+            label="${languageSelectorLabel}"
             value="${selectedLanguage}"
             clear-selection-label="${clearSelectionLabel}">
             ${langList?.map(