-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fixed duotone symbols by switching otf fonts to ttf, because of ligature hyphen problem * switchted otf to ttf * removed Font-Awesome submodule * fixed submodule and otfs * fixed otfs font bugs Co-authored-by: Martin Topfstedt <[email protected]>
- Loading branch information
Codinion
and
Martin Topfstedt
authored
Apr 23, 2022
1 parent
5e938f2
commit 6a44470
Showing
28 changed files
with
609 additions
and
588 deletions.
There are no files selected for viewing
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
Submodule Font-Awesome
updated
10499 files
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
100 changes: 50 additions & 50 deletions
100
src/FontAwesome6.Example.NetCore/FontAwesome6.Example.WPF.NetCore.csproj
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,54 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net5.0-windows</TargetFramework> | ||
| <UseWPF>true</UseWPF> | ||
| <RootNamespace>FontAwesome6.Example.WPF</RootNamespace> | ||
| <Configurations>Debug;Release;DebugPro;ReleasePro</Configurations> | ||
| <XamlDebuggingInformation>true</XamlDebuggingInformation> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\FontAwesome6.Example.WPF.Shared\FontAwesome6.Example.WPF.Shared.projitems" Label="Shared" /> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)'=='DebugPro'"> | ||
| <DefineConstants>TRACE;FontAwesomePro</DefineConstants> | ||
| <XamlDebuggingInformation>true</XamlDebuggingInformation> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)'=='ReleasePro'"> | ||
| <DefineConstants>TRACE;FontAwesomePro</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(Configuration)'=='DebugPro' Or '$(Configuration)'=='ReleasePro'"> | ||
| <EmbeddedResource Include="..\..\generated\Font-Awesome-Pro\FontAwesomeSvg.all.json" Link="Svg\FontAwesomeSvg.all.json" /> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Pro-Solid-900.otf" Link="Fonts/Font Awesome 6 Pro-Solid-900.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Pro-Regular-400.otf" Link="Fonts/Font Awesome 6 Pro-Regular-400.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Pro-Light-300.otf" Link="Fonts/Font Awesome 6 Pro-Light-300.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Brands-Regular-400.otf" Link="Fonts/Font Awesome 6 Brands-Regular-400.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Duotone-Solid-900.otf" Link="Fonts/Font Awesome 6 Duotone-Solid-900.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\otfs\Font Awesome 6 Pro-Thin-100.otf" Link="Fonts/Font Awesome 6 Pro-Thin-100.otf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FontAwesome6.Fonts.Net\FontAwesome6.Fonts.Net.csproj" /> | ||
| <ProjectReference Include="..\FontAwesome6.Svg.Net\FontAwesome6.Svg.Net.csproj" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net5.0-windows</TargetFramework> | ||
| <UseWPF>true</UseWPF> | ||
| <RootNamespace>FontAwesome6.Example.WPF</RootNamespace> | ||
| <Configurations>Debug;Release;DebugPro;ReleasePro</Configurations> | ||
| <XamlDebuggingInformation>true</XamlDebuggingInformation> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\FontAwesome6.Example.WPF.Shared\FontAwesome6.Example.WPF.Shared.projitems" Label="Shared" /> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)'=='DebugPro'"> | ||
| <DefineConstants>TRACE;FontAwesomePro</DefineConstants> | ||
| <XamlDebuggingInformation>true</XamlDebuggingInformation> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)'=='ReleasePro'"> | ||
| <DefineConstants>TRACE;FontAwesomePro</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(Configuration)'=='DebugPro' Or '$(Configuration)'=='ReleasePro'"> | ||
| <EmbeddedResource Include="..\..\generated\Font-Awesome-Pro\FontAwesomeSvg.all.json" Link="Svg\FontAwesomeSvg.all.json" /> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-regular-400.ttf" Link="Fonts/fa-regular-400.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-solid-900.ttf" Link="Fonts/fa-regular-900.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-light-300.ttf" Link="Fonts/fa-light-300.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-thin-100.ttf" Link="Fonts/fa-thin-100.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-brands-400.ttf" Link="Fonts/fa-brands-400.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="..\..\Font-Awesome-Pro\webfonts\fa-duotone-900.ttf" Link="Fonts/fa-duotone-900.ttf"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\FontAwesome6.Fonts.Net\FontAwesome6.Fonts.Net.csproj" /> | ||
| <ProjectReference Include="..\FontAwesome6.Svg.Net\FontAwesome6.Svg.Net.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Oops, something went wrong.