Browse Source

Removed fira sans and set arial as default

Krzysztof Krysiński 2 months ago
parent
commit
3086261c98

+ 1 - 1
src/PixiEditor.UI.Common/Accents/Base.axaml

@@ -239,7 +239,7 @@
             <SolidColorBrush x:Key="DockThemeControlBackgroundBrush" Color="{DynamicResource ThemeBackground1Color}" />
             <system:Double x:Key="DockFontSizeNormal">12</system:Double>
 
-            <FontFamily x:Key="ContentControlThemeFontFamily">avares://PixiEditor.UI.Common/Fonts#FiraSans, $Default</FontFamily>
+            <FontFamily x:Key="ContentControlThemeFontFamily">Arial</FontFamily>
             <system:Double x:Key="FontSizeSmall">10</system:Double>
             <system:Double x:Key="FontSizeNormal">12</system:Double>
             <system:Double x:Key="FontSizeLarge">16</system:Double>

BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Black.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-BlackItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Bold.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-BoldItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-ExtraBold.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-ExtraBoldItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-ExtraLight.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-ExtraLightItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Italic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Light.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-LightItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Medium.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-MediumItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Regular.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-SemiBold.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-SemiBoldItalic.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-Thin.ttf


BIN
src/PixiEditor.UI.Common/Fonts/FiraSans-ThinItalic.ttf


+ 0 - 8
src/PixiEditor.UI.Common/Fonts/FiraSans.axaml

@@ -1,8 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <FontFamily x:Key="FiraSans">avares://PixiEditor.UI.Common/Fonts#FiraSans</FontFamily>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>

+ 2 - 11
src/PixiEditor.UI.Common/PixiEditor.UI.Common.csproj

@@ -7,10 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <AvaloniaResource Include="Assets\*"/>
-      <None Remove="Assets\Animations\LoadingIndicator.json" />
-      <AvaloniaResource Include="Assets\Animations\LoadingIndicator.json" />
-      <AvaloniaResource Include="Fonts\PixiPerfect.ttf" />
+      <AvaloniaResource Include="Assets/**"/>
+      <AvaloniaResource Include="Fonts/**"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -19,11 +17,4 @@
       <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.5" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Compile Update="Controls\SizeInput.axaml.cs">
-        <DependentUpon>SizeInput.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-    </ItemGroup>
 </Project>