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.

Sign up for GitHub

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

Fixed Layouts category icon #153

Merged
merged 6 commits into from
Nov 28, 2023
Merged

Fixed Layouts category icon #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1789ce8
Fixed Layouts category icon
Arlodotexe Nov 7, 2023
a82b9eb
Workaround for missing implicit conversion on certain platforms
Arlodotexe Nov 8, 2023
bce2e2c
Bump Microsoft.Windows.Compatibility
Arlodotexe Nov 27, 2023
dfcc990
Upgrade to Uno.Fonts.Fluent
Arlodotexe Nov 27, 2023
1e1745d
Use Uno Fluent Font-compatible glyph for Layouts
Arlodotexe Nov 27, 2023
dcc41bd
Merge branch 'main' into fix/wasm/broke-layouts-icon
niels9001 Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommunityToolkit.App.Shared/Helpers/IconHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static class IconHelper
IconElement? iconElement = null;
switch (category)
{
case ToolkitSampleCategory.Layouts: iconElement = new FontIcon() { Glyph = "\uF58C" }; break;
case ToolkitSampleCategory.Layouts: iconElement = new FontIcon() { Glyph = "\uE138" }; break;
case ToolkitSampleCategory.Controls: iconElement = new FontIcon() { Glyph = "\ue73a" }; break;
case ToolkitSampleCategory.Animations: iconElement = new FontIcon() { Glyph = "\ue945" }; break;
case ToolkitSampleCategory.Extensions: iconElement = new FontIcon() { Glyph = "\ue95f" }; break;
Expand Down
28 changes: 0 additions & 28 deletions CommunityToolkit.App.Shared/WasmCSS/Fonts.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions MultiTarget/PackageReferences/Uno.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<!-- All Uno-based project heads and MultiTarget-enabled library projects need to reference this file, while native (UWP/WinAppSdk) heads don't. -->
<ItemGroup Condition="'$(IsUno)' == 'true'">
<PackageReference Include="Uno.UI" Version="$(CommonUnoPackageVersion)" />
<PackageReference Include="Uno.Fonts.Fluent" Version="2.3.0" />
</ItemGroup>

<PropertyGroup Condition="'$(IsUno)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion ProjectHeads/App.Head.Wasm.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<ItemGroup>
<PackageReference Include="Markdig" Version="0.31.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0-dev.2" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
Expand Down
Loading