Skip to content

Commit

Permalink
Revert "chore(merge): resolve merge conflicts from main (carbon-desig…
Browse files Browse the repository at this point in the history 
…n-system#10679)" (carbon-design-system#10685)

This reverts commit a73996c.
  • Loading branch information
@annawen1
annawen1 committed Jul 14, 2023
1 parent 2710321 commit 4908180
Show file tree
Hide file tree
Showing 221 changed files with 224 additions and 2,491 deletions.
5 changes: 2 additions & 3 deletions web-components/packages/carbon-web-components/.storybook/theme.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export default create({
fontBase: "'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif",
fontCode:
"'IBM Plex Mono', Menlo, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', Courier, monospace",
brandTitle: `@carbon/web-components ${version}`,
brandUrl:
'https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/carbon-web-components',
brandTitle: `carbon-web-components ${version}`,
brandUrl: 'https://github.com/carbon-design-system/carbon-web-components',
} as ThemeVars);
233 changes: 0 additions & 233 deletions web-components/packages/carbon-web-components/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,239 +3,6 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.30.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.29.0...@carbon/web-components@1.30.0-rc.0) (2023-07-11)


### Bug Fixes

* **date-picker:** prevent range inputs from clearing prematurely ([#10603](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10603)) ([77306c8](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/77306c89d2b5d374efdafba99b77e50cf65f61b7))
* **masthead:** Esc to close Cloud Masthead ([#10555](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10555)) ([de67bf8](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/de67bf8242ff47f2c26f285fc878f932bc822397)), closes [#10174](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10174)





# [1.29.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.29.0-rc.3...@carbon/web-components@1.29.0) (2023-06-27)

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





# [1.29.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.29.0-rc.2...@carbon/web-components@1.29.0-rc.3) (2023-06-27)


### Bug Fixes

* **multi-select:** move filterable attribute out of scope for styles ([#10608](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10608)) ([1c1cf35](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/1c1cf35ced1d73c9b0558ce474edd124ce773da8))





# [1.29.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.29.0-rc.1...@carbon/web-components@1.29.0-rc.2) (2023-06-23)

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





# [1.29.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.29.0-rc.0...@carbon/web-components@1.29.0-rc.1) (2023-06-22)


### Bug Fixes

* **masthead:** Esc to close Cloud Masthead ([#10555](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10555)) ([#10588](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10588)) ([06cd69d](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/06cd69dec6d91cafb358e078d8d083ae62edfc13)), closes [#10174](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10174)





# [1.29.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.28.0...@carbon/web-components@1.29.0-rc.0) (2023-06-09)


### Bug Fixes

* **bx-header-menu:** add button role ([#10440](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10440)) ([c5d8c5d](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/c5d8c5db8c42e129a901cda81aba7eeadb5f8c79)), closes [#10392](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10392)
* **input:** autocomplete property ([#10540](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10540)) ([6096958](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/60969585cc3792409e967784437fefd2bf096c71)), closes [#10498](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10498)
* **modal:** small screen view ([#10511](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10511)) ([7f4aaef](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/7f4aaef392fa7b3482b3544a4b0b7833034ccf33))





# [1.28.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.28.0-rc.2...@carbon/web-components@1.28.0) (2023-05-23)

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





# [1.28.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.28.0-rc.1...@carbon/web-components@1.28.0-rc.2) (2023-05-18)

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





# [1.28.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.28.0-rc.0...@carbon/web-components@1.28.0-rc.1) (2023-05-11)

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





# [1.28.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.27.0-rc.0...@carbon/web-components@1.28.0-rc.0) (2023-05-08)


### Bug Fixes

* **checkbox:** set relative `position` ([#10333](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10333)) ([8f10b78](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8f10b78cc1543ca6f2e69339be96a0974bc79631))





# [1.27.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.27.0-rc.1...@carbon/web-components@1.27.0) (2023-04-25)

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





# [1.27.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.27.0-rc.0...@carbon/web-components@1.27.0-rc.1) (2023-04-18)


### Bug Fixes

* **checkbox:** set relative `position` ([#10333](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10333)) ([8f10b78](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8f10b78cc1543ca6f2e69339be96a0974bc79631))





# [1.27.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.26.0...@carbon/web-components@1.27.0-rc.0) (2023-04-11)

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





# [1.26.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.26.0-rc.3...@carbon/web-components@1.26.0) (2023-03-28)

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





# [1.26.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.26.0-rc.2...@carbon/web-components@1.26.0-rc.3) (2023-03-27)

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





# [1.26.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.26.0-rc.1...@carbon/web-components@1.26.0-rc.2) (2023-03-23)


### Bug Fixes

* **modal:** styles with sass upgrade ([#10237](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10237)) ([46993a9](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/46993a90bcb072ae77d07ea63e672821e9bdf628))





# [1.26.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.26.0-rc.0...@carbon/web-components@1.26.0-rc.1) (2023-03-16)


### Bug Fixes

* **notificaiton/breadcrumb:** update styles/remove [@extend](https://github.com/extend) ([#10231](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10231)) ([96affe7](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/96affe7426a988e00f75e2313651a76ff095b162))





# [1.26.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.25.0...@carbon/web-components@1.26.0-rc.0) (2023-03-13)


### Bug Fixes

* **cwc:** storybook link ([#10194](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10194)) ([ea4d0a6](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/ea4d0a6c11859effef23b6aa073918dad41ce3de))
* **date-picker:** range mode clearing first value ([#10168](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10168)) ([fe4d6da](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/fe4d6dabc2ee15953de62c7d12d72d1329756b39)), closes [#10088](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10088)
* **lightbox-carousel:** accessibility & QA improvements to lightbox carousels ([#9149](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9149)) ([fa408af](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/fa408afb43e47d3c0c1259a33a47c637bedb0fac)), closes [#8911](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8911) [#8913](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8913) [#8915](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8915) [#8912](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8912) [#8914](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8914) [#8911](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8911) [#8912](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8912) [/github.com/carbon-design-system/carbon-for-ibm-dotcom/blob/main/packages/web-components/src/components/expressive-modal/expressive-modal.ts#L358](https://github.com//github.com/carbon-design-system/carbon-for-ibm-dotcom/blob/main/packages/web-components/src/components/expressive-modal/expressive-modal.ts/issues/L358) [#8913](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8913) [#8914](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8914) [#8915](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8915)
* **storybook:** fix cwc cdn link docs ([#10189](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10189)) ([8656e2e](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8656e2e84bcb48a7fe6d00d6ae66e4830650a10d))
* **tile:** fix expanable content visibility ([#10203](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10203)) ([a71b9f9](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/a71b9f9c74b854851511cad3de98f47aea46cc36)), closes [#10202](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10202)
* **tooltip:** adjust focus to div within tooltip-body ([#10217](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10217)) ([9d4a326](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/9d4a326257c869ecf7d4d1288af99a9ef8373144))





# [1.25.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.25.0-rc.0...@carbon/web-components@1.25.0) (2023-02-28)

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





# [1.25.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.24.0...@carbon/web-components@1.25.0-rc.0) (2023-02-10)

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





# [1.24.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.24.0-rc.1...@carbon/web-components@1.24.0) (2023-01-31)

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





# [1.24.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.24.0-rc.0...@carbon/web-components@1.24.0-rc.1) (2023-01-31)


### Bug Fixes

* **styles:** downgrade sass version as there is an issue with [@extend](https://github.com/extend) ([#9973](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9973)) ([8cff8a9](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/8cff8a9fb8b926dff5089497ea41a423c97d7e73))





# [1.24.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.23.0...@carbon/web-components@1.24.0-rc.0) (2023-01-25)


### Bug Fixes

* **bx-dropdown:** prevent interactivity while disabled ([#9881](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9881)) ([5fe8471](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/5fe84714b109b2cebb1cde06cf88eeb22da6baf5)), closes [#9754](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9754)
* **masthead:** update logo url protocol ([#9914](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9914)) ([ece8c04](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/ece8c0426bb222341b2ddd423498fcb9b899e7dc)), closes [#9567](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9567)
* **styles:** add missing styles for breadcrumb and modal ([#9942](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9942)) ([9a90ea1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/9a90ea15de00b182dd3795f820ef525cd1809a4e)), closes [#9936](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9936) [#9923](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9923)
* **tooltip:** close tooltip on escape or focusout ([#9871](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9871)) ([3fdd70e](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/3fdd70e85627fcf1d704b1dbb316771050ca6047)), closes [#8996](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/8996)


### Features

* **tile:** add custom event to `selected-tile` ([#9898](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9898)) ([11fe5bf](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/11fe5bfb03ded3c766e10245b03406c846bb03bd)), closes [#9740](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/9740)





# [1.23.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/web-components@1.23.0-rc.0...@carbon/web-components@1.23.0) (2023-01-17)

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

0 comments on commit 4908180

Please sign in to comment.