Skip to content

Commit

Permalink
Merge branch 'main' into chore/remove-react-styles-button-group
Browse files Browse the repository at this point in the history
  • Loading branch information
m4olivei authored Dec 23, 2024
2 parents b27a534 + 9a83fb2 commit 47945ef
Show file tree
Hide file tree
Showing 29 changed files with 271 additions and 81 deletions.
16 changes: 16 additions & 0 deletions packages/services-store/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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

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





## [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.5",
"description": "Redux store for Carbon for IBM.com Services",
"license": "Apache-2.0",
"main": "lib/store.js",
Expand Down
24 changes: 24 additions & 0 deletions packages/services/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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





## [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
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.3",
"version": "2.16.2",
"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.3",
"@carbon/ibmdotcom-utilities": "2.16.2",
"@ibm/telemetry-js": "^1.5.0",
"axios": "^1.6.8",
"marked": "^4.0.10",
Expand Down
16 changes: 16 additions & 0 deletions packages/storybook-addon-theme/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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

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





## [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.5",
"description": "Storybook add-on for Carbon theme chooser",
"license": "Apache-2.0",
"main": "es/index.js",
Expand Down
46 changes: 46 additions & 0 deletions packages/styles/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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


### Bug Fixes

* **card-group:** subgrid fixes ([#12174](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12174)) ([658b50a](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/658b50a592270b795e90804f6515552e652b7780))
* **toc:** address horizontal overflow ([#12171](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12171)) ([9291729](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/9291729ac0758048bdfa52b2e621b4fa378e620f))





## [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)


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.3",
"version": "2.16.2",
"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 @@ -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 @@ -22,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 @@ -179,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%;
}
}
9 changes: 7 additions & 2 deletions packages/styles/scss/components/card-group/_card-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
:host(#{$c4d-prefix}-card-group-item) {
display: contents;

* {
row-gap: 0;
}

.#{$prefix}--card {
display: grid;
border: 0;
Expand All @@ -73,6 +77,7 @@
display: grid;
justify-content: revert;
grid-row: span 10;
grid-template-columns: subgrid;
grid-template-rows: subgrid;

&::before,
Expand All @@ -91,15 +96,15 @@
.#{$prefix}--card__content {
display: grid;
grid-area: 1 / 1 / -1 / -1;
grid-template-columns: subgrid;
grid-template-rows: subgrid;
row-gap: 0;
}

.#{$prefix}--card__copy {
display: grid;
grid-row: span 2;
grid-template-columns: subgrid;
grid-template-rows: subgrid;
row-gap: 0;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

.#{$prefix}--content-group-cards__row {
display: grid;
margin-inline: -$spacing-05;

@include breakpoint(md) {
grid-auto-rows: 1fr;
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 @@ -15,7 +15,7 @@
@use '../lightbox-media-viewer/lightbox-media-viewer';

@mixin link-with-icon {
.#{$c4d-prefix}--link-with-icon,
.#{$prefix}--link-with-icon,
:host(#{$c4d-prefix}-link-with-icon),
:host(#{$c4d-prefix}-link-list-item),
:host(#{$c4d-prefix}-link-list-item-cta),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ $hover-transition-timing: 95ms;

.#{$prefix}--toc__navbar-chevron-right-container {
z-index: 2;
inset-inline-end: -$spacing-01;
inset-inline-end: 0;

@include breakpoint(md) {
inset-inline-end: -$spacing-05;
Expand Down Expand Up @@ -417,11 +417,11 @@ $hover-transition-timing: 95ms;
border-block-start: 1px solid $border-subtle-00;
content: '';
inset-block-start: -1px;
inset-inline: calc(-50vw + 50%) 100%;
inset-inline: calc(-50vw + 50% + $spacing-03) 100%;
}

&::after {
inset-inline: 100% calc(-50vw + 50%);
inset-inline: 100% calc(-50vw + 50% + $spacing-03);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@

::slotted(#{$c4d-prefix}-content-group:not([slot])),
::slotted(#{$c4d-prefix}-cta-block-item-row:not([slot])),
::slotted(#{$c4d-prefix}-content-group-cards-item:not([slot])),
::slotted([data-autoid^='c4d--tabs-']:not([slot])),
::slotted([data-autoid^='c4d--card']:not([slot])) {
margin-inline-start: 0;
Expand Down
24 changes: 24 additions & 0 deletions packages/utilities/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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





## [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-utilities





# [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-utilities





# [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-utilities
Expand Down
2 changes: 1 addition & 1 deletion packages/utilities/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-utilities",
"description": "Carbon for IBM.com Utilities",
"version": "2.16.0-rc.3",
"version": "2.16.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/utilities/src/utilities/settings/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.0',
* Carbon for IBM.com v2.16.2',
*/
const settings = {
version: 'Carbon for IBM.com v2.16.0',
version: 'Carbon for IBM.com v2.16.2',
stablePrefix: 'c4d',
prefix: 'cds',
};
Expand Down
Loading

0 comments on commit 47945ef

Please sign in to comment.