diff --git a/.gitignore b/.gitignore index cf1eb9bc..7ee71699 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ obj *.user .\packages\* /VERSION.txt -*.opencover.xml \ No newline at end of file +*.opencover.xml diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf new file mode 100644 index 00000000..14b71961 Binary files /dev/null and b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Bold.ttf differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf new file mode 100644 index 00000000..45327058 Binary files /dev/null and b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-BoldItalic.ttf differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf new file mode 100644 index 00000000..89e5ce4b Binary files /dev/null and b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Italic.ttf differ diff --git a/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf new file mode 100644 index 00000000..c4fa6fbe Binary files /dev/null and b/Wabbajack.App.Wpf/Resources/Fonts/AtkinsonHyperlegible-Regular.ttf differ diff --git a/Wabbajack.App.Wpf/Themes/Styles.xaml b/Wabbajack.App.Wpf/Themes/Styles.xaml index 88495b48..30a0012f 100644 --- a/Wabbajack.App.Wpf/Themes/Styles.xaml +++ b/Wabbajack.App.Wpf/Themes/Styles.xaml @@ -10,6 +10,8 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d"> + pack://application:,,,/Resources/Fonts/#Atkinson Hyperlegible + @@ -38,11 +40,11 @@ #525252 #ffc400 - #e83a40 - #52b545 + #db2955 + #5fad56 #967400 - #BB86FC + #D9BBF9 #00BB86FC #3700B3 #270080 @@ -234,21 +236,21 @@ @@ -1620,7 +1622,7 @@ diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj index c926c24a..18fe20eb 100644 --- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj +++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj @@ -51,6 +51,12 @@ + + + + + + @@ -101,6 +107,7 @@ + @@ -110,6 +117,18 @@ + + Never + + + Never + + + Never + + + Never +