Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(git): revert squash merge of v2 branch #11228

Merged

Conversation

kennylam
Copy link
Member

Description

This reverts commit 4a43a1a to undo previous squash merge, in order to better preserve history and contributions.

Changelog

New

  • {{new thing}}

Changed

  • revert 4a43a1a and rebase history

Removed

  • {{removed thing}}

ibmdotcom-bot and others added 30 commits July 25, 2023 16:12
…panel (carbon-design-system#10739)

* fix(ui-shell): adjust header action button

* fix(header-global-action): set the panel expanded state

* fix(ui-shell): add tooltip-text for initial
* chore(workflows): allow on feat/*

* fix(percy): ensure percy runs

* chore(react): remove package

* chore(e2e): remove react in workflows

* fix(react): adding pictogram and removing react e2e

* fix(test): installed enzyme

* fix(tests): tests succeed

* chore(jest): update snapshots

* fix(yarn): update lockfile

* fix(yarn): updated lockfile

* fix(storybook): react wrapper now compiles

---------

Co-authored-by: kennylam <[email protected]>
* fix(cwc-v2): fix styles and theme examples

* fix(docs): add style info

* fix(styles): remove layer tokens from styles

* fix(styling): temp layout mixin

* fix(ui-shell): missing style and format code

* fix(popover): button style extend

* fix(overflow): missing class and fix prefixes

* fix(code): format everything

* fix(combo-box): placeholder padding

* fix(data-table): batch actions size

* fix(examples): with update theme token info

* fix(tile): add emit layout token for all variants

* fix(ui-shell): storybook padding

* fix(styling-story): test

* fix(styling): docs set specific tag

---------

Co-authored-by: Anna Wen <[email protected]>
* fix(styling): missing tokens

* fix(search): hover

* fix(search): format and remove pointer events

* fix(data-table): hover

* fix(search): expandable size
…design-system#10767)

* chore(upgrade-cwc-v2): upgrade to latest carbon styles/icons

* fix(header-global-action): bring back header action button

---------

Co-authored-by: Ariella Gilmore <[email protected]>
Co-authored-by: Anna Wen <[email protected]>
@ibmdotcom-bot
Copy link
Contributor

@kennylam kennylam changed the title Chore/v2 merge restore history chore(git): revert squash merge of v2 branch Dec 13, 2023
@ibmdotcom-bot
Copy link
Contributor

@ibmdotcom-bot
Copy link
Contributor

Copy link
Member

@emyarod emyarod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me!

@kennylam kennylam merged commit 4f7d219 into carbon-design-system:main Dec 13, 2023
10 of 19 checks passed
@kennylam kennylam deleted the chore/v2-merge-restore-history branch December 13, 2023 20:35
kennylam added a commit to kennylam/carbon-for-ibm-dotcom that referenced this pull request Jun 11, 2024
…merge-restore-history

chore(git): revert squash merge of v2 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants