Revert "Remove WPF Material Design theme to attempt to remove blanking."

This reverts commit 0a89c0c767.

# Conflicts:
#	BodyshopUploader/Releases/RELEASES
This commit is contained in:
Patrick Fic
2021-04-08 15:54:38 -07:00
parent 07e2b06ffd
commit fbeb3861ed
7 changed files with 3947 additions and 242 deletions

View File

@@ -5,13 +5,15 @@
ShutdownMode="OnExplicitShutdown"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
Exit="Application_Exit"
xmlns:ui="http://schemas.modernwpf.com/2019"
StartupUri="Views\Login.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ui:ThemeResources />
<ui:XamlControlsResources />
<ResourceDictionary Source="pack://application:,,,/ToastNotifications.Messages;component/Themes/Default.xaml" />
<materialDesign:BundledTheme BaseTheme="Light"
PrimaryColor="Grey"
SecondaryColor="LightBlue" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>