Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/cla-assistant/gith…
Browse files Browse the repository at this point in the history
…ub-action-2.6.1
  • Loading branch information
kennylam authored Oct 30, 2024
2 parents a6e67da + 9c3d732 commit d444379
Show file tree
Hide file tree
Showing 73 changed files with 744 additions and 819 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions docs/release-schedule.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
This is a living document outlining the plan for previous, current, and future
major versions of the Carbon for IBM.com library.

| Release | Status | Initial release | Begin Active | Begin Maintenance | End of life |
| ------- | ----------- | --------------- | ------------ | ----------------- | ----------- |
| `main` | unstable | unstable | unstable | unstable | unstable |
| v1 | Maintenance | 2019-10-31 | 2019-10-31 | 2023-09-30 | 2025-03-31 |
| v2 | Active | 2023-10-30 | 2023-11-30 | 2025-03-31 | 2027-03-31 |
| v3 | Unreleased | 2024-06-30 | 2025-03-31 | 2027-03-31 | 2029-03-31 |
| Release | Status | Initial release | Begin Active | Begin Maintenance | End of Support |
| ------- | ----------- | --------------- | ------------ | ----------------- | -------------- |
| `main` | unstable | unstable | unstable | unstable | unstable |
| v1 | Maintenance | 2019-10-31 | 2019-10-31 | 2023-09-30 | 2025-03-31 |
| v2 | Active | 2023-10-30 | 2023-11-30 | 2025-03-31 | 2027-03-31 |
| v3 | Unreleased | 2024-06-30 | 2025-03-31 | 2027-03-31 | 2029-03-31 |

> Dates are subject to change
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.14.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-25)

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





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

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





# [2.14.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-21)

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





# [2.14.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-15)

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





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

**Note:** Version bump only for package @carbon/ibmdotcom-services
Expand Down
6 changes: 3 additions & 3 deletions packages/services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ and our

## <picture><source height="20" width="20" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-dark.svg"><source height="20" width="20" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"><img height="20" width="20" alt="IBM Telemetry" src="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"></picture> IBM Telemetry

This package uses IBM Telemetry to collect metrics data. By installing this
package as a dependency you are agreeing to telemetry collection. To opt out,
see
This package uses IBM Telemetry to collect de-identified and anonymized metrics
data. By installing this package as a dependency you are agreeing to telemetry
collection. To opt out, see
[Opting out of IBM Telemetry data collection](https://github.com/ibm-telemetry/telemetry-js/tree/main#opting-out-of-ibm-telemetry-data-collection).
For more information on the data being collected, please see the
[IBM Telemetry documentation](https://github.com/ibm-telemetry/telemetry-js/tree/main#ibm-telemetry-collection-basics).
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.13.1",
"version": "2.14.0",
"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.13.1",
"@carbon/ibmdotcom-utilities": "2.14.0",
"@ibm/telemetry-js": "^1.5.0",
"axios": "^1.6.8",
"marked": "^4.0.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/telemetry.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# yaml-language-server: $schema=https://unpkg.com/@ibm/telemetry-config-schema@v1/dist/config.schema.json
version: 1
projectId: e68866bc-10f8-4c87-81b1-a3776d4e801e
endpoint: https://collector-prod.1am6wm210aow.us-south.codeengine.appdomain.cloud/v1/metrics
endpoint: https://www-api.ibm.com/ibm-telemetry/v1/metrics
collect:
npm:
dependencies: null
Expand Down
36 changes: 36 additions & 0 deletions packages/styles/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,42 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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


### Bug Fixes

* **conten-group-heading:** render h3 tag to light DOM ([#12074](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12074)) ([cf153d0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/cf153d0556404b60bf9876348f52c1ee05725360))
* **feature-card:** fix feature card broken styles and refactor ([#12082](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12082)) ([465a022](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/465a02296ad54b5c49b3e6a6620a8cc7c6433990))





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

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





# [2.14.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-21)

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





# [2.14.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-10-15)

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





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

**Note:** Version bump only for package @carbon/ibmdotcom-styles
Expand Down
6 changes: 3 additions & 3 deletions packages/styles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ and our

## <picture><source height="20" width="20" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-dark.svg"><source height="20" width="20" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"><img height="20" width="20" alt="IBM Telemetry" src="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"></picture> IBM Telemetry

This package uses IBM Telemetry to collect metrics data. By installing this
package as a dependency you are agreeing to telemetry collection. To opt out,
see
This package uses IBM Telemetry to collect de-identified and anonymized metrics
data. By installing this package as a dependency you are agreeing to telemetry
collection. To opt out, see
[Opting out of IBM Telemetry data collection](https://github.com/ibm-telemetry/telemetry-js/tree/main#opting-out-of-ibm-telemetry-data-collection).
For more information on the data being collected, please see the
[IBM Telemetry documentation](https://github.com/ibm-telemetry/telemetry-js/tree/main#ibm-telemetry-collection-basics).
Expand Down
10 changes: 5 additions & 5 deletions 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.13.1",
"version": "2.14.0",
"license": "Apache-2.0",
"main": "dist/ibm-dotcom-styles.min.css",
"module": "src/scss",
Expand Down Expand Up @@ -30,14 +30,14 @@
"upgrade-carbon": "yarn upgrade-interactive @carbon/layout @carbon/styles @carbon/themes @carbon/icons-react --latest --exact"
},
"dependencies": {
"@carbon/icons-react": "11.49.0",
"@carbon/layout": "11.26.0",
"@carbon/icons-react": "11.51.0",
"@carbon/layout": "11.27.0",
"@carbon/styles": "1.65.0",
"@carbon/type": "11.31.0",
"@carbon/type": "11.32.1",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/themes": "11.40.0",
"@carbon/themes": "11.42.0",
"del": "^6.0.0",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^6.1.0",
Expand Down
64 changes: 60 additions & 4 deletions packages/styles/scss/components/card-group/_card-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,42 @@
}

:host(#{$c4d-prefix}-card-group-item) {
display: contents;

.#{$prefix}--card {
display: grid;
border: 0;
grid-row: span 10;
grid-template-rows: subgrid;
margin-block-end: $spacing-07;
outline: 1px solid $border-tile-01;
outline-offset: 0;

.#{$prefix}--card__wrapper {
display: grid;
justify-content: revert;
grid-row: span 10;
grid-template-rows: subgrid;

&::before,
&::after {
content: revert;
}
}

.#{$prefix}--card__content {
display: grid;
grid-row: span 10;
grid-template-rows: subgrid;
row-gap: 0;
}

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

.#{$prefix}--image {
Expand All @@ -84,6 +116,30 @@
outline-offset: -1px;
}
}

&[grid-mode='narrow'] {
.#{$prefix}--card {
margin-block-end: $spacing-05;
}
}

&[grid-mode='condensed'] {
.#{$prefix}--card {
margin-block-end: 0;
}
}

::slotted(#{$c4d-prefix}-card-footer) {
display: revert;
margin-block-start: revert;
}

// Selects elements that contain tags which are slotted into the default
// slot. Note that this does not work in Chrome at time of writing.
// @see https://developer.chrome.com/blog/has-m105/#performance_and_limitations
::slotted(:not([slot]):has(#{$prefix}-tag, #{$c4d-prefix}-tag)) {
grid-row: -1;
}
}

:host(#{$c4d-prefix}-card-group-item[href='']) {
Expand All @@ -110,24 +166,24 @@

:host(#{$c4d-prefix}-card-group)[grid-mode='narrow'] {
@include breakpoint(sm) {
gap: $spacing-03;
gap: 0 $spacing-03;
padding-block-start: $spacing-03;
}

@include breakpoint(md) {
gap: $spacing-05;
gap: 0 $spacing-05;
padding-block-start: $spacing-05;
}
}

:host(#{$c4d-prefix}-card-group)[grid-mode='default'] {
@include breakpoint(sm) {
gap: $spacing-07;
gap: 0 $spacing-07;
padding-block-start: $spacing-03;
}

@include breakpoint(md) {
gap: $spacing-07;
gap: 0 $spacing-07;
padding-block-start: $spacing-05;
}
}
Expand Down
15 changes: 13 additions & 2 deletions packages/styles/scss/components/card/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@use '@carbon/styles/scss/components/tag/index' as *;
@use '@carbon/styles/scss/components/tile/index' as *;
@use '@carbon/styles/scss/theme' as *;
@use '@carbon/styles/scss/utilities/convert' as *;
@use '../../globals/vars' as *;
@use '../../globals/utils/content-width' as *;
@use '../../globals/utils/ratio-base' as *;
Expand Down Expand Up @@ -141,9 +142,13 @@

.#{$prefix}--card__heading,
.#{$prefix}--card__copy {
@include content-width;

color: $text-primary;
max-inline-size: to-rem(640px);
padding-inline-end: 10%;

@include breakpoint(md) {
padding-inline-end: $spacing-07;
}
}

.#{$prefix}--card__copy:not([hidden]) {
Expand Down Expand Up @@ -185,6 +190,10 @@
}
}

.#{$prefix}--card__pictogram-wrapper {
display: flex;
}

&[pictogram] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
padding-block-start: 0;
Expand Down Expand Up @@ -417,6 +426,7 @@

:host(#{$c4d-prefix}-card-eyebrow),
.#{$prefix}--card__eyebrow {
display: block;
@include content-width;
@include type-style('label-02');

Expand Down Expand Up @@ -597,6 +607,7 @@

:host(#{$c4d-prefix}-card-heading),
:host(#{$c4d-prefix}-card-link-heading) {
display: block;
@include content-width;

color: $text-primary;
Expand Down
Loading

0 comments on commit d444379

Please sign in to comment.