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

@@ -12,6 +12,13 @@
xmlns:p="clr-namespace:BodyshopPartner.Properties"
xmlns:util="clr-namespace:BodyshopPartner.Utils"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular"
TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}"
Closing="Window_Closing"
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen">
@@ -26,7 +33,7 @@
Value="8" />
</Style>
<Style TargetType="TextBox"
>
BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
<Setter Property="Margin"
Value="8" />
</Style>
@@ -48,7 +55,7 @@
VerticalAlignment="Center" />
<TextBlock Text="{x:Static p:Resources.Title_Login_Header}"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
VerticalAlignment="Center" />
</StackPanel>
@@ -78,7 +85,7 @@
<Button Command="{Binding LoginCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
Content="{x:Static p:Resources.Login}"
Style="{StaticResource MaterialDesignRaisedButton}"
IsDefault="True"
materialDesign:ButtonProgressAssist.Value="-1"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"