Update next branch with changes from main
#10572
Conversation
github-actions
bot
added
the
cla-needed
sophschneider
force-pushed
the
sophie/merge-main
branch
from
301de7a
to
8a87b9b
Compare
github-actions
bot
removed
the
cla-needed
sophschneider
force-pushed
the
sophie/merge-main
branch
from
acc93f3
to
0f5ea7b
Compare
sophschneider
force-pushed
the
sophie/merge-main
branch
from
a2746e6
to
817a331
Compare
sophschneider
requested review from
jesstelford,
MaxCloutier,
kyledurand,
lgriffee,
laurkim,
mattkubej,
yurm04 and
aaronccasanova
| @@ -35,25 +35,13 @@ | |||
|
|
|||
| .Item { | |||
| position: relative; | |||
| // stylelint-disable-next-line polaris/z-index/declaration-property-value-allowed-list -- override z-index | |||
| z-index: unset; | |||
| margin-top: 0; | |||
There was a problem hiding this comment.
Changes from this commit into main
cc: @mattkubej would you be able to tophat and make sure these changes still work on our feature branch? I think it's just the focus ring on separated buttons right?
There was a problem hiding this comment.
I noticed in the storybook regression tests that pressed segmented buttons no longer have a dark right side border from this change. Is that intentional?
| Before | After |
|---|---|
 |
 |
There was a problem hiding this comment.
I tophatted pagination and segmented buttons and they match the main storybook 👍 we may have to fix the right shadow/border in a follow up PR to main
| @@ -22,4 +22,41 @@ | |||
| background-color: var(--p-color-bg-strong-active); | |||
| } | |||
| } | |||
|
|
|||
| &.table { | |||
There was a problem hiding this comment.
@mattkubej I removed the se23 when merging this into our feature branch, are the styles still working as expected?
There was a problem hiding this comment.
I tophatted and it seems to match main 👍
There was a problem hiding this comment.
Sorry, just seeing this note. Removing should be good. Thanks!
| @@ -9,18 +9,4 @@ | |||
| display: flex; | |||
| justify-content: center; | |||
| align-items: center; | |||
|
|
|||
There was a problem hiding this comment.
@gwyneplaine @jesstelford I think these styles were missed in the IndexTable cleanup, are they good to remove? The se23 styles seem to just be reseting the styles I deleted above but I haven't tophatted
There was a problem hiding this comment.
I tophatted against main, it all looks good (the same, no regressions :) )
|
I have a few questions about the UI test changes but I've confirmed they match main so I've accepted them |
|
@aaronccasanova @lgriffee I've merged in your latest token changes (since you last reviewed Laura), lmk if they look ok! |
|
I'm going to merge this PR to unblock some folks, if there are any more concerns we can fix with a follow up PR! |
|
FYI @yurm04 @jesstelford the modal website examples are looking a bit off when closing the modal. Not sure if this a regression bc the example isn't working on the base branch rn but maybe we should fix with a follow up PR. Might have to do with wrapping the examples in edit: made an issue here #10586 
|
Looked at the latest token changes added and they look good! |
Updates `next` branch with latest changes from `main`. 1. `git merge main` into a `next` branch 2. Resolve conflicts by manually going through `main` commits and `next` commits to gain context and take what was needed 3. Solved any typescript errors including net new migrated components (e.g. I renamed net new `HorizontalStack`s to `InlineStack`, any net new button props I manually migrated) 4. Consolidated net new se23 styles 5. Made sure storybook ran as expected 6. Made sure doc website ran as expected > 🚨 Please verify that changes in the last linked commit above look as expected in storybook (see CI for link)
Updates
nextbranch with latest changes frommain.git merge maininto anextbranchmaincommits andnextcommits to gain context and take what was neededHorizontalStacks toInlineStack, any net new button props I manually migrated)