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: Add ShadowContainer Sample Page & TextBox Shadow Style (backport #849) #860

Closed
wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 11, 2023

This is an automatic backport of pull request #849 done by Mergify.
Cherry-pick of 6fdfd38 has failed:

On branch mergify/bp/legacy/4x/pr-849
Your branch is up to date with 'origin/legacy/4x'.

You are currently cherry-picking commit 6fdfd38.
  (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:   Uno.Gallery/Uno.Gallery.Shared/Controls/ContentPageLayout.cs
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml.cs
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/FluentPalettePage.xaml
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml
	modified:   Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml.cs
	new file:   Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
	new file:   Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
	new file:   Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml.cs
	new file:   Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
	both modified:   Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
	both modified:   Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
	both modified:   Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

(cherry picked from commit 6fdfd38)

# Conflicts:
#	Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
#	Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
#	Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
#	Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj
@agneszitte
Copy link
Contributor

Will need to wait after unoplatform/uno.toolkit.ui#703 for Uno.Toolkit.Skia.WinUI package

@agneszitte agneszitte linked an issue Aug 23, 2023 that may be closed by this pull request
14 tasks
@kazo0 kazo0 closed this Aug 28, 2023
@mergify mergify bot deleted the mergify/bp/legacy/4x/pr-849 branch August 28, 2023 17:02
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.

[Gallery] Shadow samples showcase
2 participants