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(merge): merge feat/carbon-for-ibm-dotcom-v2 into main #11161

Merged
merged 450 commits into from
Nov 30, 2023

Conversation

kennylam
Copy link
Member

@kennylam kennylam commented Nov 21, 2023

Description

Merge feat/carbon-for-ibm-dotcom-v2 feature branch into main.

Changelog

New

  • {{new thing}}

Changed

  • {{changed thing}}

Removed

  • {{removed thing}}

ibmdotcom-bot and others added 30 commits July 20, 2023 13:14
…#10719)

* feat(carbon): upgrade styles and icon to latest

* feat(carbon): upgrade styles and icon to latest

* fix(button): remove unnessary styles

* fix(accordion): sizing issue

* fix(button): add layout-size class

* fix(text-input): add layout size class

* fix(accordion): style prefix

* fix(tag): extend layout size class

* fix(select + search): add layer template and edit sb knob names

* fix(content-switcher): style updates

* fix(content-switcher): format

* fix(copy-button): classes not getting assigned

* fix(file-uploader): add layout--size class to button

* fix(story): add new prop for popover

* fix(code-snippet): skeleton and copy-button placement

* fix(button): format

* fix(code-snippet): remove astrick

* fix(combo-box): direction top styles

* chore(radio-button): add warn and invalid variations

* fix(ui-shell): missing utility

* fix(ui-shell): content-switcher spacing

* chore(pagination): adjust pagination component sizes

* fix(text-area): hidelabel not working

* fix(notification): low-contrast styles

---------

Co-authored-by: Anna Wen <[email protected]>
* fix(styles): fix search input width on expand

* fix(radio-button): invalid text styles

* fix(overflow-menu): flipped & hover styles

* fix(modal): button styles and storybook alignment

* fix(slider): add warn and fix invalid state

---------

Co-authored-by: ariellalgilmore <[email protected]>
…ge.json files (carbon-design-system#10740)

* fix(script): remove postinstall script

* fix(package): don't need to add file to package.json
…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
@ibmdotcom-bot
Copy link
Contributor

ibmdotcom-bot commented Nov 21, 2023

@kennylam kennylam closed this Nov 21, 2023
@kennylam kennylam reopened this Nov 21, 2023
@kennylam kennylam force-pushed the chore/dotcom-v2-main-merge branch from 7585419 to b6ce531 Compare November 22, 2023 13:18
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!

Copy link
Contributor

@IgnacioBecerra IgnacioBecerra left a comment

Choose a reason for hiding this comment

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

Started reviewing yesterday and finished going through the files just now... looks good to me!

@kennylam kennylam force-pushed the chore/dotcom-v2-main-merge branch from b6ce531 to 3b3f5d6 Compare November 22, 2023 20:23
@kennylam kennylam changed the title chore(merge): merge feat/dotcom-v2 into main chore(merge): merge feat/carbon-for-ibm-dotcom-v2 into main Nov 27, 2023
kennylam and others added 4 commits November 29, 2023 17:18
* chore(lit): update lit 2 imports

* chore(deps): add on.js to utils; fix imports

* chore(styles): update to-rem mixin name

* chore(styles): remove unused vars

* fix(styles): update leadspace styles
…on-for-ibm-dotcom into chore/dotcom-v2-main-merge
…on-for-ibm-dotcom into chore/dotcom-v2-main-merge
@kennylam kennylam merged commit f7fd7e7 into carbon-design-system:main Nov 30, 2023
5 of 15 checks passed
@kennylam kennylam deleted the chore/dotcom-v2-main-merge branch November 30, 2023 16:32
@abdonrd
Copy link
Contributor

abdonrd commented Dec 13, 2023

This PR has been squashed, causing all contribution history to be lost. 😕
(same with #11217)

A year's work? has been reduced to a one commit (f7fd7e7) in the name of @kennylam:

4,373 changed files with 106,075 additions and 421,213 deletions.

Screenshot 2023-12-13 at 9 37 57 AM

Example with my profile:

Screenshot 2023-12-13 at 9 42 17 AM

Being an open source project, it is a bit ugly to delete contributions.
Not just for me, but for all the other contributors.

@kennylam @jeffchew can we get this back? Thank you! 🙏

@jeffchew
Copy link
Member

Thanks for pointing out @abdonrd , I think also should be for all team members that touched the feature branch.

@kennylam , any way to easily merge this in as a merge commit? I know you spent a lot of time resolving the conflicts....

@abdonrd
Copy link
Contributor

abdonrd commented Dec 14, 2023

Fixed, thanks @kennylam!

Screenshot 2023-12-14 at 12 54 04 PM

kennylam added a commit to kennylam/carbon-for-ibm-dotcom that referenced this pull request Jun 11, 2024
…on-design-system#11161)

* chore(merge): merge feat/carbon-for-ibm-dotcom-v2 into main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.