Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
eeca6b07f8
2 files changed
+2
-84
No files matched your search
+1
-42
@@ -7,48 +7,7 @@
|
||||
mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}"
|
||||
d:DesignHeight="900" d:DesignWidth="1140">
|
||||
<UserControl.Resources>
|
||||
<Style x:Key="RadioButtonStyle" TargetType="{x:Type RadioButton}">
|
||||
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}"/>
|
||||
<Setter Property="BorderBrush" Value="#FFF0F0F0"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}"/>
|
||||
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}"/>
|
||||
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="OverridesDefaultStyle" Value="True"/>
|
||||
<Setter Property="Padding" Value="6 0 0 0"/>
|
||||
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type RadioButton}">
|
||||
<Grid>
|
||||
<Border x:Name="border" Background="{TemplateBinding Background}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition>
|
||||
</ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.Column="1"
|
||||
Text="{TemplateBinding Content}"
|
||||
FontFamily="Fonts/#FontAwesome"
|
||||
HorizontalAlignment="Center"
|
||||
Width="80" FontSize="20" Margin="0,5,0,0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#FFA0A0A0" TargetName="border"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Background" Value="#FFF5F5F5" TargetName="border"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
|
||||
+1
-42
@@ -10,48 +10,7 @@
|
||||
d:DesignHeight="900" d:DesignWidth="1140"
|
||||
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro">
|
||||
<UserControl.Resources>
|
||||
<Style x:Key="RadioButtonStyle" TargetType="{x:Type RadioButton}">
|
||||
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}"/>
|
||||
<Setter Property="BorderBrush" Value="#FFF0F0F0"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}"/>
|
||||
<Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}"/>
|
||||
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="OverridesDefaultStyle" Value="True"/>
|
||||
<Setter Property="Padding" Value="6 0 0 0"/>
|
||||
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type RadioButton}">
|
||||
<Grid>
|
||||
<Border x:Name="border" Background="{TemplateBinding Background}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition>
|
||||
</ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.Column="1"
|
||||
Text="{TemplateBinding Content}"
|
||||
FontFamily="Fonts/#FontAwesome"
|
||||
HorizontalAlignment="Center"
|
||||
Width="80" FontSize="20" Margin="0,5,0,0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#FFA0A0A0" TargetName="border"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter Property="Background" Value="#FFF5F5F5" TargetName="border"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Convert:ColorSQLConvert x:Key="ColorSQLConvert"/>
|
||||
<Convert:ProductTypeSQLConvert x:Key="ProductTypeSQLConvert"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
Reference in new issue
Block a user