Add custom styles to all application

This commit is contained in:
Adrien Allard committed 2020-11-16 21:52:29 +01:00
1 parent 5e7761938c
commit 57af0e5305
3 files changed
+1 -8

No files matched your search

@@ -12,6 +12,7 @@
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Views/Resources/Colors.xaml"/>
<ResourceDictionary Source="../Views/Resources/CustomStyles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--Global View Model Locator-->
@@ -8,13 +8,6 @@
mc:Ignorable="d"
d:DesignHeight="100" d:DesignWidth="800"
d:DataContext="{d:DesignData /SampleData/ConversionJobSampleData.xaml}">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Views/Resources/CustomStyles.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid Background="{Binding State, Converter={StaticResource ConversionStateToBrush}, ConverterParameter=Background}" Margin="0,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@@ -24,7 +24,6 @@
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/CustomStyles.xaml"/>
<ResourceDictionary Source="Resources/ConversionPresetTemplates.xaml"/>
</ResourceDictionary.MergedDictionaries>