Skip to content

Commit

Permalink
Merge branch 'main' into feat/migrate-caem-video-enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
m4olivei committed Dec 13, 2024
2 parents d887549 + fb65348 commit 504b69d
Show file tree
Hide file tree
Showing 70 changed files with 907 additions and 510 deletions.
8 changes: 8 additions & 0 deletions packages/services-store/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.53.4](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store





## [1.53.3](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-store
Expand Down
2 changes: 1 addition & 1 deletion packages/services-store/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-services-store",
"private": true,
"version": "1.53.3",
"version": "1.53.4",
"description": "Redux store for Carbon for IBM.com Services",
"license": "Apache-2.0",
"main": "lib/store.js",
Expand Down
32 changes: 32 additions & 0 deletions packages/services/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-07)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [2.16.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-05)

**Note:** Version bump only for package @carbon/ibmdotcom-services





# [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
Expand Down
4 changes: 2 additions & 2 deletions packages/services/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-services",
"description": "Carbon for IBM.com Services",
"version": "2.16.0-rc.1",
"version": "2.16.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/ibmdotcom-utilities": "2.16.0-rc.1",
"@carbon/ibmdotcom-utilities": "2.16.1",
"@ibm/telemetry-js": "^1.5.0",
"axios": "^1.6.8",
"marked": "^4.0.10",
Expand Down
8 changes: 8 additions & 0 deletions packages/storybook-addon-theme/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.44.4](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)

**Note:** Version bump only for package @carbon/storybook-addon-theme





## [1.44.3](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/storybook-addon-theme
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-addon-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/storybook-addon-theme",
"private": true,
"version": "1.44.3",
"version": "1.44.4",
"description": "Storybook add-on for Carbon theme chooser",
"license": "Apache-2.0",
"main": "es/index.js",
Expand Down
59 changes: 59 additions & 0 deletions packages/styles/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,65 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.16.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)


### Bug Fixes

* **callout-quote:** fix horizontal scroll for callout quote ([#12164](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12164)) ([be2e956](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/be2e9564cd8d1532720d07de365408b9b19395c5))
* **callout-with-media:** spacing adjustments ([#12124](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12124)) ([4a7c1d1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/4a7c1d1d982f2fa508a5b475d4229152bd28c384))
* **card-group:** set min height to content ([#12128](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12128)) ([8dc1099](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8dc109929b6807a2fad759f41c8051d238b0c4f5))
* **card:** remove bad styles ([#12141](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12141)) ([13fd7a5](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/13fd7a5cb0bb56e345cb78bd684b8c93e09ef55b))
* **cta-block:** adjust cta-block-item-row inline margin ([#12140](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12140)) ([b5ee952](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/b5ee952f7ceee190df1cff0204b0dc6252b0feaf))
* **feature-card:** inverse styles and cta-type="video" ([#12146](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12146)) ([888d642](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/888d642de7502eb4abfb215403ef9aec8835994e))
* **feature-section:** stretch image if needed ([#12126](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12126)) ([8bc634a](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8bc634af30b40e0b2884963c29781ef610431737))
* **footer:** adjustments to adjunct links visibility ([#12136](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12136)) ([30b1ce7](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/30b1ce7d18c665f9665cb3f13d308b74b1ab9842))
* **footer:** adjustments to style for color and positioning ([#12135](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12135)) ([8036383](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/80363830f4aa617fd5c24612b4ab9164309fdd3a))
* **leadspace-breadcrumb:** leadspace breadcrumb was missing a max-width ([#12139](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12139)) ([3ee263d](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/3ee263d35f3746689f2cd4fae27194e467a3d852))
* **toc:** remove implicit top and bottom padding for TOC ([#12144](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12144)) ([5e52b77](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/5e52b771b54fcff284222f7d04e6e0f5c19cdc1a))





# [2.16.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-12)


### Bug Fixes

* **card:** pictogram related style adjustments ([#12155](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12155)) ([3e7bcc9](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/3e7bcc980c3a9cc1e1dde230610bbd57bf1f4f60))
* **content-group-cards:** fix alignment ([#12160](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12160)) ([19e9b4f](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/19e9b4fa1339aa2c817ad66fd1ebafe5eadabb06))
* **link-with-icon:** fix icon placement ([#12159](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12159)) ([8459cc7](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8459cc79f407083861c33867c58ac9edfc61a818))





# [2.16.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-07)


### Bug Fixes

* **card:** push the footer to the bottom of the card consistently ([#12137](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12137)) ([e817962](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/e817962c042db7b49f25db44cbaed3d7c23b4a8f))
* **link-list:** v2 style regressions ([#12125](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12125)) ([b400091](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/b4000916f8743c6fcb9c3b7f8042d0fd93e55ed8))


### Features

* **video-player:** enable autoplay & load as muted ([#12150](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12150)) ([a68e9ba](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/a68e9ba3e78deced9ff0fd1d9553741de8a56136))





# [2.16.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-12-05)

**Note:** Version bump only for package @carbon/ibmdotcom-styles





# [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
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-styles",
"description": "Carbon for IBM.com Styles",
"version": "2.16.0-rc.1",
"version": "2.16.1",
"license": "Apache-2.0",
"main": "dist/ibm-dotcom-styles.min.css",
"module": "src/scss",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/motion' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/utilities/convert' as *;

@use '../../globals/vars' as *;
@use '../lightbox-media-viewer';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
@include quote;

@mixin callout-quote {
* {
box-sizing: border-box;
}

:host(#{$c4d-prefix}-callout-quote) {
@extend :host(#{$c4d-prefix}-callout);
@extend :host(#{$c4d-prefix}-callout-text);
Expand Down Expand Up @@ -99,12 +103,9 @@
}

:host(#{$c4d-prefix}-callout-quote) #{$c4d-prefix}-hr {
margin: $spacing-05;
margin: $spacing-05 $spacing-07;
@include breakpoint(md) {
margin: $spacing-05 0;
}
@include breakpoint(lg) {
margin: $spacing-05 $spacing-03;
margin: $spacing-05;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/utilities' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../internal/callout/callout' as *;
@use '../../internal/content-block';
Expand All @@ -21,6 +22,10 @@
@include callout;

@mixin callout-with-media {
* {
box-sizing: border-box;
}

:host(#{$c4d-prefix}-callout-with-media) {
@extend :host(#{$c4d-prefix}-callout);

Expand Down Expand Up @@ -178,7 +183,7 @@
}
}

:host(#{$c4d-prefix}-callout-with-media-image) .#{$prefix}--image__img {
:host(#{$c4d-prefix}-callout-with-media-image) .#{$c4d-prefix}--image__img {
max-inline-size: 100%;
}
}
2 changes: 2 additions & 0 deletions packages/styles/scss/components/card-group/_card-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/themes' as *;
@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../globals/utils/ratio-base' as *;
Expand Down Expand Up @@ -62,6 +63,7 @@
display: grid;
border: 0;
grid-row: span 10;
grid-template-columns: subgrid;
grid-template-rows: subgrid;
margin-block-end: $spacing-07;
outline: 1px solid $border-tile-01;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@use '@carbon/styles/scss/motion' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/utils/aspect-ratio';
@use '../../globals/utils/ratio-base' as *;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @license
*
* 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.
Expand All @@ -12,6 +12,7 @@
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/type' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../card-group/card-group';

Expand Down
36 changes: 28 additions & 8 deletions packages/styles/scss/components/card/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@
}
}

.#{$prefix}--card {
display: flex;
flex-direction: column;
justify-content: space-between;
}

.#{$prefix}--card__wrapper {
display: flex;
flex: 1;
Expand Down Expand Up @@ -151,7 +157,7 @@
}
}

.#{$prefix}--card__copy:not([hidden]) {
.#{$prefix}--card__copy {
@include type-style('body-02');

margin-block-end: $spacing-07;
Expand Down Expand Up @@ -213,10 +219,6 @@

.#{$prefix}--card__copy {
margin-block: $spacing-07 0;

&[hidden] {
margin: 0;
}
}

svg {
Expand Down Expand Up @@ -248,6 +250,16 @@
align-items: flex-start;
}

.#{$prefix}--card__content {
padding-block-end: $spacing-10;
}

.#{$prefix}--card__pictogram-wrapper {
position: absolute;
inset-block-end: $spacing-05;
inset-inline-start: $spacing-05;
}

.#{$prefix}--card__copy {
margin-block-end: $spacing-07;
}
Expand Down Expand Up @@ -280,6 +292,13 @@
display: flex;
flex-direction: column;
gap: $spacing-05;

&[hidden] {
// Need important to force [hidden] to really mean hidden above many
// other variants setting display.
/* stylelint-disable declaration-no-important */
display: none !important;
}
}
}

Expand Down Expand Up @@ -555,14 +574,15 @@
}

:host(#{$c4d-prefix}-card)[color-scheme='inverse']:not([disabled]),
:host(#{$c4d-prefix}-card-group-item)[color-scheme='inverse']:not([disabled])
.#{$prefix}--card {
:host(#{$c4d-prefix}-card-group-item)[color-scheme='inverse']:not(
[disabled]
) {
.#{$prefix}--tile {
border-color: $background-inverse;
background-color: $background-inverse;

&:hover {
#{$c4d-prefix}-image,
.#{$c4d-prefix}-image,
::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image) {
filter: brightness(108%);
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -8,6 +8,7 @@
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/themes' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../internal/content-block';
@use '../../internal/content-group';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@use '@carbon/styles/scss/breakpoint' as *;
@use '@carbon/styles/scss/config' as *;
@use '@carbon/styles/scss/spacing' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/utils/flex-grid' as *;
@use '../../globals/vars' as *;
@use '../../internal/content-block';
Expand Down
Loading

0 comments on commit 504b69d

Please sign in to comment.