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

fix(RatingControl)!: adjust ratingcontrol resource keys (backport #1350) #1352

Merged
merged 2 commits into from
Feb 13, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 8, 2024

This is an automatic backport of pull request #1350 done by Mergify.
Cherry-pick of 24d80ff has failed:

On branch mergify/bp/release/stable/4.1/pr-1350
Your branch is up to date with 'origin/release/stable/4.1'.

You are currently cherry-picking commit 24d80ffc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   build/.markdownlint.json
	modified:   doc/styles/RatingControl.md
	modified:   src/library/Uno.Material/Styles/Controls/v2/RatingControl.xaml
	modified:   src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/material-migration.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

BREAKING CHANGE: RatingControl Lightweight Styling keys have changed to align the WinUI resoure keys

(cherry picked from commit 24d80ff)

# Conflicts:
#	doc/material-migration.md
@kazo0
Copy link
Collaborator

kazo0 commented Feb 13, 2024

@Mergifyio refresh

Copy link
Author

mergify bot commented Feb 13, 2024

refresh

✅ Pull request refreshed

@kazo0 kazo0 merged commit 6e65d74 into release/stable/4.1 Feb 13, 2024
13 checks passed
@kazo0 kazo0 deleted the mergify/bp/release/stable/4.1/pr-1350 branch February 13, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant