Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix/callout-quote-c…
Browse files Browse the repository at this point in the history
…ontent-grid
  • Loading branch information
sangeethababu9223 committed Aug 21, 2023
2 parents 7e6a3dd + 4e2b940 commit eaca3ee
Show file tree
Hide file tree
Showing 28 changed files with 262 additions and 49 deletions.
16 changes: 16 additions & 0 deletions packages/carbon-web-components/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.31.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/web-components





# [1.31.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/web-components





# [1.31.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)


Expand Down
2 changes: 1 addition & 1 deletion packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carbon/web-components",
"version": "1.31.0-rc.0",
"version": "1.31.0-rc.2",
"publishConfig": {
"access": "public"
},
Expand Down
16 changes: 16 additions & 0 deletions packages/eslint-config-ibmdotcom/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.41.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.41.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.41.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**Note:** Version bump only for package @carbon/eslint-config-ibmdotcom
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-ibmdotcom/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/eslint-config-ibmdotcom",
"private": true,
"version": "1.41.0-rc.0",
"version": "1.41.0-rc.2",
"description": "ESLint configuration for Carbon for IBM.com",
"license": "Apache-2.0",
"main": "index.js",
Expand All @@ -18,7 +18,7 @@
"eslint": "^6.8.0"
},
"dependencies": {
"@carbon/eslint-plugin-react-prop-type-comments": "1.40.0-rc.0",
"@carbon/eslint-plugin-react-prop-type-comments": "1.40.0-rc.2",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"babel-eslint": "^10.1.0",
Expand Down
16 changes: 16 additions & 0 deletions packages/eslint-plugin-ibmdotcom-import-rules/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.40.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/eslint-plugin-ibmdotcom-import-rules





# [1.40.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/eslint-plugin-ibmdotcom-import-rules





# [1.40.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**Note:** Version bump only for package @carbon/eslint-plugin-ibmdotcom-import-rules
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-ibmdotcom-import-rules/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/eslint-plugin-ibmdotcom-import-rules",
"private": true,
"version": "1.40.0-rc.0",
"version": "1.40.0-rc.2",
"description": "ESLint plugin for Carbon for IBM.com checking imports",
"license": "Apache-2.0",
"main": "lib/index.js",
Expand Down
16 changes: 16 additions & 0 deletions packages/eslint-plugin-react-prop-type-comments/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.40.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/eslint-plugin-react-prop-type-comments





# [1.40.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

**Note:** Version bump only for package @carbon/eslint-plugin-react-prop-type-comments





# [1.40.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**Note:** Version bump only for package @carbon/eslint-plugin-react-prop-type-comments
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/eslint-plugin-react-prop-type-comments",
"private": true,
"version": "1.40.0-rc.0",
"version": "1.40.0-rc.2",
"description": "ESLint plugin for Carbon for IBM.com checking React prop type comments",
"license": "Apache-2.0",
"main": "lib/index.js",
Expand Down
16 changes: 16 additions & 0 deletions packages/react/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.50.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)


Expand Down
10 changes: 5 additions & 5 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/ibmdotcom-react",
"description": "Carbon for IBM.com React Components",
"version": "1.50.0-rc.0",
"version": "1.50.0-rc.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -63,9 +63,9 @@
},
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/ibmdotcom-services": "1.50.0-rc.0",
"@carbon/ibmdotcom-styles": "1.50.0-rc.0",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.0",
"@carbon/ibmdotcom-services": "1.50.0-rc.2",
"@carbon/ibmdotcom-styles": "1.50.0-rc.2",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.2",
"@carbon/telemetry": "^0.1.0",
"autosuggest-highlight": "^3.1.1",
"carbon-components": "10.58.8",
Expand All @@ -87,7 +87,7 @@
"@babel/preset-react": "~7.12.1",
"@carbon/icons-react": "10.49.1",
"@carbon/pictograms-react": "11.45.2",
"@carbon/storybook-addon-theme": "1.41.0-rc.0",
"@carbon/storybook-addon-theme": "1.41.0-rc.2",
"@percy-io/in-percy": "^0.1.11",
"@percy/cli": "^1.8.1",
"@percy/cypress": "^3.1.1",
Expand Down
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.50.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**Note:** Version bump only for package @carbon/ibmdotcom-services-store
Expand Down
6 changes: 3 additions & 3 deletions 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.50.0-rc.0",
"version": "1.50.0-rc.2",
"description": "Redux store for Carbon for IBM.com Services",
"license": "Apache-2.0",
"main": "lib/store.js",
Expand Down Expand Up @@ -30,8 +30,8 @@
"test:unit": "yarn jest"
},
"dependencies": {
"@carbon/ibmdotcom-services": "1.50.0-rc.0",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.0",
"@carbon/ibmdotcom-services": "1.50.0-rc.2",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.2",
"carbon-components": "10.58.3",
"redux": "^4.0.0",
"redux-logger": "^3.0.0",
Expand Down
16 changes: 16 additions & 0 deletions packages/services/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.50.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**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": "1.50.0-rc.0",
"version": "1.50.0-rc.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@babel/runtime": "^7.16.3",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.0",
"@carbon/ibmdotcom-utilities": "1.50.0-rc.2",
"@carbon/telemetry": "0.1.0",
"axios": "^0.27.2",
"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.41.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.41.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.41.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**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.41.0-rc.0",
"version": "1.41.0-rc.2",
"description": "Storybook add-on for Carbon theme chooser",
"license": "Apache-2.0",
"main": "es/index.js",
Expand Down
16 changes: 16 additions & 0 deletions packages/stylelint-config-ibmdotcom/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.40.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.40.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.40.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)

**Note:** Version bump only for package @carbon/stylelint-config-ibmdotcom
Expand Down
2 changes: 1 addition & 1 deletion packages/stylelint-config-ibmdotcom/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/stylelint-config-ibmdotcom",
"private": true,
"version": "1.40.0-rc.0",
"version": "1.40.0-rc.2",
"description": "Stylelint configuration for Carbon for IBM.com",
"license": "Apache-2.0",
"main": "index.js",
Expand Down
19 changes: 19 additions & 0 deletions packages/styles/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.50.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)


### Bug Fixes

* **content-item-horizontal:** fix media overflow on mobile ([#10857](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10857)) ([f8f7b62](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/f8f7b62f9b8297bd9584fc22375dc5d503772cc6))





# [1.50.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-18)

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





# [1.50.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-14)


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": "1.50.0-rc.0",
"version": "1.50.0-rc.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 @@ -164,7 +164,10 @@
}

::slotted([slot='media']) {
grid-column: 1 / span 12;
grid-column: 1 / span 4;
@include carbon--breakpoint(lg) {
grid-column: 1 / span 12;
}
}
::slotted(#{$dds-prefix}-image) {
max-width: none;
Expand Down
Loading

0 comments on commit eaca3ee

Please sign in to comment.