Skip to content

T
Thick-Common
Commit d6383b25 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

把 v8的style 复制过来

parent e1b6e7f0
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 36 deletions
Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
View file @ d6383b25
......@@ -269,6 +269,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Resource>
<Page Include="Themes\Styles.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI.OSK\WdFullKeyboard.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle2.xaml
View file @ d6383b25
......@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--空按钮-->
<Style TargetType="Button" x:Key="Styles.Button.Empty">
......@@ -41,7 +41,7 @@
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="36" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="Background" Value="#FF3B3B3B" />
<Setter Property="Template">
<Setter.Value>
......@@ -71,7 +71,7 @@
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="48" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="Background" Value="#FF3B3B3B" />
<Setter Property="Template">
<Setter.Value>
......@@ -104,7 +104,7 @@
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="48" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="Background" Value="#FF3B3B3B" />
<Setter Property="Template">
<Setter.Value>
......@@ -176,13 +176,15 @@
<Style x:Key="Styles.Button.Square.Accent2" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square.Accent}" >
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="Width" Value="120"/>
<Setter Property="Height" Value="40"/>
<Setter Property="Margin" Value="5"/>
</Style>
<Style x:Key="Styles.Button.Square2" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square}" >
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="Width" Value="120"/>
<Setter Property="Height" Value="40"/>
<Setter Property="Margin" Value="5"/>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Colors2.xaml
View file @ d6383b25
......@@ -2,21 +2,109 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--激活颜色-->
<SolidColorBrush x:Key="Brushes.Activity" Color="{StaticResource MahApps.Colors.AccentBase}"/>
<Color x:Key="Colors.Activity">#FF0078D7</Color>
<!--MahApps.Colors.AccentBase-->
<!--不活动颜色-->
<SolidColorBrush x:Key="Brushes.Static" Color="{StaticResource MahApps.Colors.Gray1}"/>
<Color x:Key="Colors.Static" >#FF333333</Color>
<!--MahApps.Colors.Gray1-->
<!--不活动颜色-->
<SolidColorBrush x:Key="Brushes.NoAct" Color="{StaticResource MahApps.Colors.Gray2}"/>
<Color x:Key="Colors.NoAct" >#FF7F7F7F</Color>
<!--MahApps.Colors.Gray2-->
<!--背景色-->
<SolidColorBrush x:Key="Brushes.ThemeBackground" Color="{StaticResource MahApps.Colors.ThemeBackground}"/>
<Color x:Key="Colors.ThemeBackground">white</Color>
<!--MahApps.Colors.ThemeBackground-->
<!--激活的字颜色-->
<SolidColorBrush x:Key="Brushes.Text.Activity" Color="{StaticResource MahApps.Colors.Highlight}"/>
<Color x:Key="Colors.Text.Activity">#FF00589F</Color>
<!--MahApps.Colors.Highlight-->
<!--不合法颜色-->
<SolidColorBrush x:Key="Brushes.Validation" Color="DarkRed"/>
<Color x:Key="Colors.Validation">DarkRed</Color>
<!--高亮颜色-->
<Color x:Key="Colors.Highlight">#f34336</Color>
<!--Pass颜色-->
<Color x:Key="Colors.Pass" >#4cae50</Color>
<!--Fault颜色-->
<Color x:Key="Colors.Fault">#f34336</Color>
<!--Card.Badged 背景颜色-->
<Color x:Key="Colors.Card.Badged.Background">#FFC107</Color>
<!--Card.Badged 前景颜色-->
<Color x:Key="Colors.Card.Badged.Foreground">Black</Color>
<!--字 颜色-->
<Color x:Key="Colors.Text.White">White</Color>
<Color x:Key="Colors.Text.Gray">#FFC3C3C3</Color>
<Color x:Key="Colors.Text.Black">Black</Color>
<!--灰 颜色-->
<Color x:Key="Colors.Gray">#FFBEBEBE</Color>
<Color x:Key="Colors.Gray1">#FF333333</Color>
<Color x:Key="Colors.Gray2">#FF7F7F7F</Color>
<Color x:Key="Colors.Gray3">#FF9D9D9D</Color>
<Color x:Key="Colors.Gray4">#FFA59F93</Color>
<Color x:Key="Colors.Gray5">#FFB9B9B9</Color>
<Color x:Key="Colors.Gray6">#FFCCCCCC</Color>
<Color x:Key="Colors.Gray7">#FFD8D8D9</Color>
<Color x:Key="Colors.Gray8">#FFE0E0E0</Color>
<Color x:Key="Colors.Gray9">#5EC9C9C9</Color>
<Color x:Key="Colors.Gray10">#FFF7F7F7</Color>
<Color x:Key="Colors.AccentBase">#FF0078D7</Color>
<Color x:Key="Colors.Accent">#CC0078D7</Color>
<Color x:Key="Colors.Accent2">#990078D7</Color>
<Color x:Key="Colors.Accent3">#660078D7</Color>
<Color x:Key="Colors.Accent4">#330078D7</Color>
<!--激活颜色-->
<SolidColorBrush x:Key="Brushes.Activity" Color="{StaticResource Colors.Activity}"/>
<!--不活动颜色-->
<SolidColorBrush x:Key="Brushes.Static" Color="{StaticResource Colors.Static}"/>
<!--不活动颜色-->
<SolidColorBrush x:Key="Brushes.NoAct" Color="{StaticResource Colors.NoAct}"/>
<!--背景色，卡片背景颜色-->
<SolidColorBrush x:Key="Brushes.ThemeBackground" Color="{StaticResource Colors.ThemeBackground}"/>
<!--激活的字颜色-->
<SolidColorBrush x:Key="Brushes.Text.Activity" Color="{StaticResource Colors.Text.Activity}"/>
<!--不合法颜色-->
<SolidColorBrush x:Key="Brushes.Highlight" Color="Red"/>
<SolidColorBrush x:Key="Brushes.Validation" Color="{StaticResource Colors.Validation}"/>
<!--高亮颜色-->
<SolidColorBrush x:Key="Brushes.Highlight" Color="{StaticResource Colors.Highlight}"/>
<!--Pass颜色-->
<SolidColorBrush x:Key="Brushes.Pass" Color="{StaticResource Colors.Pass}"/>
<!--Fault颜色-->
<SolidColorBrush x:Key="Brushes.Fault" Color="{StaticResource Colors.Fault}"/>
<!--Badged 底部颜色-->
<SolidColorBrush x:Key="Brushes.Card.Badged.Background" Color="{StaticResource Colors.Card.Badged.Background}"/>
<!--Badged 字颜色-->
<SolidColorBrush x:Key="Brushes.Card.Badged.Foreground" Color="{StaticResource Colors.Card.Badged.Foreground}"/>
<!--卡片所在容器 背景 颜色-->
<SolidColorBrush x:Key="Brushes.Card.Background" Color="{StaticResource Colors.Gray8}"/>
<SolidColorBrush x:Key="Brushes.Text.White" Color="{StaticResource Colors.Text.White}"/>
<SolidColorBrush x:Key="Brushes.Text.Gray" Color="{StaticResource Colors.Text.Gray}"/>
<SolidColorBrush x:Key="Brushes.Text.Black" Color="{StaticResource Colors.Text.Black}"/>
<SolidColorBrush x:Key="Brushes.Gray1" Color="{StaticResource Colors.Gray1}" />
<SolidColorBrush x:Key="Brushes.Gray2" Color="{StaticResource Colors.Gray2}" />
<SolidColorBrush x:Key="Brushes.Gray3" Color="{StaticResource Colors.Gray3}" />
<SolidColorBrush x:Key="Brushes.Gray4" Color="{StaticResource Colors.Gray4}" />
<SolidColorBrush x:Key="Brushes.Gray5" Color="{StaticResource Colors.Gray5}" />
<SolidColorBrush x:Key="Brushes.Gray6" Color="{StaticResource Colors.Gray6}" />
<SolidColorBrush x:Key="Brushes.Gray7" Color="{StaticResource Colors.Gray7}" />
<SolidColorBrush x:Key="Brushes.Gray8" Color="{StaticResource Colors.Gray8}" />
<SolidColorBrush x:Key="Brushes.Gray9" Color="{StaticResource Colors.Gray9}" />
<SolidColorBrush x:Key="Brushes.Gray10" Color="{StaticResource Colors.Gray10}" />
<SolidColorBrush x:Key="Brushes.Gray" Color="{StaticResource Colors.Gray}" />
<SolidColorBrush x:Key="Brushes.AccentBase" Color="{StaticResource Colors.AccentBase}" />
<SolidColorBrush x:Key="Brushes.Accent" Color="{StaticResource Colors.Accent}" />
<SolidColorBrush x:Key="Brushes.Accent2" Color="{StaticResource Colors.Accent2}" />
<SolidColorBrush x:Key="Brushes.Accent3" Color="{StaticResource Colors.Accent3}" />
<SolidColorBrush x:Key="Brushes.Accent4" Color="{StaticResource Colors.Accent4}" />
<!--随机颜色-->
<x:Array x:Key="Brushes.Random" Type="SolidColorBrush">
<SolidColorBrush>#2195f2</SolidColorBrush>
......@@ -38,7 +126,7 @@
<SolidColorBrush>#1b224d</SolidColorBrush>
<SolidColorBrush>#474d14</SolidColorBrush>
</x:Array>
<!--扫描图，纵向趋势图Y轴 标签颜色-->
<SolidColorBrush x:Key="Brushes.Area0">#f34336</SolidColorBrush>
<SolidColorBrush x:Key="Brushes.Area1">#fec007</SolidColorBrush>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle2.xaml
View file @ d6383b25
......@@ -5,11 +5,11 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle2.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--这个文件的生成方式只能选 Page， 不用选resource 不然会提示
无法从 iconPacks:PackIconMaterial 生成 TargetType -->
<!--标准图标按钮 内部为iconPacks的按键，下方可带文字 -->
<Style TargetType="iconPacks:PackIconMaterial" x:Key="Styles.Icon.Base" >
<Setter Property="Width" Value="36"/>
......@@ -118,6 +118,7 @@
<Trigger Property="IsKeyboardFocused" Value="true">
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" Value="{StaticResource Brushes.NoAct}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
......@@ -134,4 +135,27 @@
<Style TargetType="iconPacks:PackIconMaterial" BasedOn="{StaticResource Styles.Icon.Rectangle}"/>
</Style.Resources>
</Style>
<!--使用iconPacks 的 checkbox -->
<Style TargetType="{x:Type ToggleButton}" x:Key="Styles.ToggleButton.Check" >
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border Background="{TemplateBinding Background}" CornerRadius="2" >
<iconPacks:PackIconMaterial x:Name="icon" Kind="CheckboxBlankOutline" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="icon" Property="Kind" Value="CheckboxMarkedOutline"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml
View file @ d6383b25
......@@ -5,19 +5,19 @@
</ResourceDictionary.MergedDictionaries>
<!--参数设置界面标题背景颜色-->
<SolidColorBrush x:Key="Brushes.TitleBar.Background" Color="{StaticResource MahApps.Colors.Accent2}"/>
<SolidColorBrush x:Key="Brushes.TitleBar.Foreground" Color="{StaticResource MahApps.Colors.ThemeBackground}"/>
<SolidColorBrush x:Key="Brushes.TitleBar.Background" Color="{StaticResource Colors.Accent}"/>
<SolidColorBrush x:Key="Brushes.TitleBar.Foreground" Color="{StaticResource Colors.ThemeBackground}"/>
<!-- 参数设置页 每个section 的标题框 内的标题-->
<Style TargetType="TextBlock" x:Key="Styles.ParamSection.Text">
<Setter Property="Margin" Value="5"/>
<Setter Property="Foreground" Value="White" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="30" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="{StaticResource FontFamily.Field}" />
<Setter Property="TextAlignment" Value="Right" />
</Style>
<!-- 参数设置页 每个section 的标题框 -->
<Style TargetType="Border" x:Key="Styles.ParamSection.Border">
<Setter Property="Width" Value="150"/>
......@@ -37,7 +37,7 @@
</Style.Resources>
</Style>
<!-- 参数页标题 -->
<Style TargetType="TextBlock" x:Key="Styles.TitleBar.Text">
<Setter Property="Margin" Value="160,0,0,0" />
......@@ -67,11 +67,18 @@
<Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
<Setter Property="Content">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="ArrowLeftThick"
HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0"
Width="60" Height="auto" />
<iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
</Setter.Value>
</Setter>
<Style.Resources>
<Style TargetType="iconPacks:PackIconMaterial" >
<Setter Property="Width" Value="60"/>
<Setter Property="Height" Value="Auto" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="0" />
</Style>
</Style.Resources>
</Style>
......@@ -88,14 +95,23 @@
<Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/>
<Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
<Setter Property="Width" Value="60"/>
<Setter Property="Height" Value="{Binding Width,RelativeSource={RelativeSource Mode=Self}}"/>
<Setter Property="Height" Value="60"/>
<Setter Property="Content">
<Setter.Value>
<iconPacks:PackIconMaterial Kind="ArrowLeftBold" SnapsToDevicePixels ="True" Width="30" Height="auto" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<iconPacks:PackIconMaterial Kind="ArrowLeftBold"/>
</Setter.Value>
</Setter>
<Style.Resources>
<Style TargetType="iconPacks:PackIconMaterial" >
<Setter Property="Width" Value="30"/>
<Setter Property="Height" Value="Auto" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="SnapsToDevicePixels" Value="True" />
</Style>
</Style.Resources>
</Style>
<!--标题区,左边的后退键(白底蓝图标) 小-->
<Style TargetType="Button" x:Key="Styles.TitleBar.BackButton4" BasedOn="{StaticResource Styles.TitleBar.BackButton3}">
<Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Background}"/>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Styles.xaml 0 → 100644
View file @ d6383b25
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/MaterialDesignIcons.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/TextStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/SectionStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/NoToggleButtonStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ToggleButtonOnOffStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/UiModuleStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/IconButtonStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/SectionStyle2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/TextStyle2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/UiModuleStyle2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/IconButtonStyle2.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/CardStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/PgMenuStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml
View file @ d6383b25
......@@ -11,11 +11,17 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<sys:Double x:Key="FontSize.FieldHeader">18</sys:Double>
<!--<sys:Double x:Key="FontSize.FieldHeader">18</sys:Double>
<sys:Double x:Key="FontSize.FieldHeader.Small">12</sys:Double>
<sys:Double x:Key="FontSize.FieldContent">30</sys:Double>
<sys:Double x:Key="FontSize.FieldContent.Small">18</sys:Double>
<sys:Double x:Key="FontSize.FieldContent.Middle">24</sys:Double>
<sys:Double x:Key="FontSize.FieldContent.Middle">24</sys:Double>-->
<sys:Double x:Key="FontSize.FieldHeader">18</sys:Double>
<sys:Double x:Key="FontSize.FieldHeader.Small">12</sys:Double>
<sys:Double x:Key="FontSize.FieldContent">24</sys:Double>
<sys:Double x:Key="FontSize.FieldContent.Small">14</sys:Double>
<sys:Double x:Key="FontSize.FieldContent.Middle">18</sys:Double>
<Thickness x:Key="Margin.Text">3</Thickness>
<!-- 输入框 带虚拟键盘 -->
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/UiModuleStyle2.xaml
View file @ d6383b25
......@@ -8,34 +8,38 @@
<Setter Property="Background" Value="{StaticResource Brushes.ThemeBackground}"/>
<Setter Property="Margin" Value="3"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Effect">
<!--<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="Black" Direction="270" ShadowDepth="1" Opacity="0.23" />
</Setter.Value>
</Setter>-->
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="{StaticResource Colors.Gray1}" Opacity=".25" BlurRadius="5" ShadowDepth="3"/>
</Setter.Value>
</Setter>
</Style>
<!--动态区 UiModule 的 每个项的小标题-->
<Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemHeader">
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
<Setter Property="FontFamily" Value="Global Sans Serif"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Margin" Value="3,0"/>
</Style>
<Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue">
<Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
<Setter Property="FontFamily" Value="Global Sans Serif"/>
<Setter Property="FontSize" Value="24"/>
</Style>
<Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue.Separator">
<Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="24" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="Global Sans Serif" />
<Setter Property="Text" Value="|"/>
</Style>
<Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue.Unit">
<Setter Property="Foreground" Value="#FF555555" />
<Setter Property="FontSize" Value="12" />
<Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="FontFamily" Value="Global Sans Serif" />
<Setter Property="VerticalAlignment" Value="Bottom" />
</Style>
</ResourceDictionary>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment