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

feat: Switch to OpenSans (backport #15958) #17451

Merged
merged 22 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2024

GitHub Issue (If applicable): closes #3954, closes #17381

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):


This is an automatic backport of pull request #15958 done by [Mergify](https://mergify.com).

Youssef1313 and others added 21 commits July 10, 2024 17:00
(cherry picked from commit 1fb0bd3)
(cherry picked from commit 8c6f098)
(cherry picked from commit ae80270)
Co-authored-by: Jérôme Laban <[email protected]>
(cherry picked from commit 55a3546)
(cherry picked from commit 26721ee)
(cherry picked from commit 781dcc1)
(cherry picked from commit fd723e7)
(cherry picked from commit e9a3ded)

# Conflicts:
#	src/SamplesApp/SamplesApp.Shared/App.xaml.cs
(cherry picked from commit b7d07c9)
(cherry picked from commit 97cafc6)
Co-authored-by: Jérôme Laban <[email protected]>
(cherry picked from commit 7f56160)
(cherry picked from commit 462b95d)
(cherry picked from commit 5e5538c)
(cherry picked from commit e7f77c1)
(cherry picked from commit 929073d)
(cherry picked from commit 0fddc7a)
@mergify mergify bot added the conflicts label Jul 10, 2024
Copy link
Contributor Author

mergify bot commented Jul 10, 2024

Cherry-pick of e9a3ded has failed:

On branch mergify/bp/release/stable/5.3/pr-15958
Your branch is ahead of 'origin/release/stable/5.3' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e9a3ded327.
  (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:   src/SamplesApp/Directory.Build.targets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/SamplesApp/SamplesApp.Shared/App.xaml.cs

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 mergify bot mentioned this pull request Jul 10, 2024
6 tasks
@github-actions github-actions bot added area/code-generation Categorizes an issue or PR as relevant to code generation area/automation Categorizes an issue or PR as relevant to project automation kind/documentation area/sdk Categorizes an issue or PR as relevant to the Uno.Sdk labels Jul 10, 2024
@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-17451/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-17451/index.html

@jeromelaban jeromelaban merged commit 7e3609c into release/stable/5.3 Jul 10, 2024
56 of 95 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.3/pr-15958 branch July 10, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/automation Categorizes an issue or PR as relevant to project automation area/code-generation Categorizes an issue or PR as relevant to code generation area/sdk Categorizes an issue or PR as relevant to the Uno.Sdk conflicts kind/documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants