fixes duplicate StyleInclude in ControlCatalog #5615
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maxkatz6
reviewed
Mar 4, 2021
| @@ -69,10 +66,6 @@ public class App : Application | |||
| Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml") | |||
| }, | |||
| new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog")) | |||
| { | |||
| Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml") | |||
There was a problem hiding this comment.
But these resources aren't included with any other StyleInclude.
There are different styles from Fluent theme, that were included with Default on Control Catalog, so we can use Fluent-only resources on some pages.
There was a problem hiding this comment.
ok, I close the pr
workgroupengineering
deleted the
fixes/Samples/ContronsCatalog/Duplicate-StyleInclude
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does the pull request do?
What is the current behavior?
What is the updated/expected behavior with this PR?
How was the solution implemented (if it's not obvious)?
Checklist
Breaking changes
Fixed issues