Merge pull request #428 from irihitech/aqua

HighContrast themes
This commit is contained in:
Dong Bin
2024-10-18 15:51:09 +08:00
committed by GitHub
97 changed files with 757 additions and 537 deletions

View File

@@ -1,9 +1,9 @@
<Application <Application
x:Class="Ursa.Demo.App" x:Class="Ursa.Demo.App"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u-semi="https://irihi.tech/ursa/themes/semi" xmlns:semi="https://irihi.tech/semi"
xmlns:semi="https://irihi.tech/semi"> xmlns:u-semi="https://irihi.tech/ursa/themes/semi">
<Application.Styles> <Application.Styles>
<semi:SemiTheme Locale="zh-CN" /> <semi:SemiTheme Locale="zh-CN" />
<u-semi:SemiTheme Locale="zh-CN" /> <u-semi:SemiTheme Locale="zh-CN" />

View File

@@ -8,8 +8,8 @@ namespace Ursa.Demo.Converters;
public class IconNameToPathConverter: IValueConverter public class IconNameToPathConverter: IValueConverter
{ {
private readonly string[] _paths = new[] private readonly string[] _paths =
{ [
"M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z", "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z",
"M16 12L9 2L2 12H3.86L0 18H7V22H11V18H18L14.14 12H16M20.14 12H22L15 2L12.61 5.41L17.92 13H15.97L19.19 18H24L20.14 12M13 19H17V22H13V19Z", "M16 12L9 2L2 12H3.86L0 18H7V22H11V18H18L14.14 12H16M20.14 12H22L15 2L12.61 5.41L17.92 13H15.97L19.19 18H24L20.14 12M13 19H17V22H13V19Z",
"M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z", "M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z",
@@ -17,7 +17,7 @@ public class IconNameToPathConverter: IValueConverter
"M16,9V7H12V12.5C11.58,12.19 11.07,12 10.5,12A2.5,2.5 0 0,0 8,14.5A2.5,2.5 0 0,0 10.5,17A2.5,2.5 0 0,0 13,14.5V9H16M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z", "M16,9V7H12V12.5C11.58,12.19 11.07,12 10.5,12A2.5,2.5 0 0,0 8,14.5A2.5,2.5 0 0,0 10.5,17A2.5,2.5 0 0,0 13,14.5V9H16M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z",
"M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z", "M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z",
"M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12S17.5 2 12 2M12.5 13H11V7H12.5V11.3L16.2 9.2L17 10.5L12.5 13Z" "M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12S17.5 2 12 2M12.5 13H11V7H12.5V11.3L16.2 9.2L17 10.5L12.5 13Z"
}; ];
public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{ {
if (value is int i) if (value is int i)

View File

@@ -16,7 +16,7 @@
<StackPanel HorizontalAlignment="Left" Margin="24 0 0 0 "> <StackPanel HorizontalAlignment="Left" Margin="24 0 0 0 ">
<u:Divider Content="Simple Form"/> <u:Divider Content="Simple Form"/>
<u:Form LabelPosition="Left" LabelWidth="*"> <u:Form LabelPosition="Left" LabelWidth="*">
<TextBox Width="300" u:FormItem.Label="Name" /> <TextBox Width="300" u:FormItem.Label="Name" u:FormItem.IsRequired="True" />
<TextBox Width="300" u:FormItem.Label="Email" /> <TextBox Width="300" u:FormItem.Label="Email" />
<TextBox Width="300" u:FormItem.Label="Message" Classes="TextArea"/> <TextBox Width="300" u:FormItem.Label="Message" Classes="TextArea"/>
</u:Form> </u:Form>

View File

@@ -19,7 +19,7 @@
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="Semi.Avalonia" Version="11.1.0.2" /> <PackageReference Include="Semi.Avalonia" Version="11.1.0.5-beta1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,9 +1,14 @@
using System; using System;
using System.Collections.ObjectModel;
using Avalonia;
using Avalonia.Styling;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using Semi.Avalonia;
namespace Ursa.Demo.ViewModels; namespace Ursa.Demo.ViewModels;
public class MainViewViewModel : ViewModelBase public partial class MainViewViewModel : ViewModelBase
{ {
public MenuViewModel Menus { get; set; } = new MenuViewModel(); public MenuViewModel Menus { get; set; } = new MenuViewModel();
@@ -75,4 +80,33 @@ public class MainViewViewModel : ViewModelBase
_ => throw new ArgumentOutOfRangeException(nameof(s), s, null) _ => throw new ArgumentOutOfRangeException(nameof(s), s, null)
}; };
} }
public ObservableCollection<ThemeItem> Themes { get; } =
[
new("Default", ThemeVariant.Default),
new("Light", ThemeVariant.Light),
new("Dark", ThemeVariant.Dark),
new("Aquatic", SemiTheme.Aquatic),
new("Desert", SemiTheme.Desert),
new("Dust", SemiTheme.Dust),
new("NightSky", SemiTheme.NightSky)
];
[ObservableProperty] private ThemeItem? _selectedTheme;
partial void OnSelectedThemeChanged(ThemeItem? oldValue, ThemeItem? newValue)
{
if (newValue is null) return;
var app = Application.Current;
if (app is not null)
{
app.RequestedThemeVariant = newValue.Theme;
}
}
}
public class ThemeItem(string name, ThemeVariant theme)
{
public string Name { get; set; } = name;
public ThemeVariant Theme { get; set; } = theme;
} }

View File

@@ -18,6 +18,7 @@
</Design.DataContext> </Design.DataContext>
<UserControl.Resources> <UserControl.Resources>
<converters:IconNameToPathConverter x:Key="IconConverter" /> <converters:IconNameToPathConverter x:Key="IconConverter" />
<StreamGeometry x:Key="SettingIcon">M7.99973 5.07197C7.19713 5.53535 6.20729 5.53113 5.40866 5.06092L5.1637 4.91669C4.55751 4.55978 3.77662 4.65563 3.34264 5.20927C2.69567 6.03462 2.17585 6.94251 1.79166 7.90124C1.53027 8.55354 1.83733 9.27693 2.449 9.62286L2.69407 9.76145C3.50107 10.2178 4.00002 11.0732 4.00002 12.0003C4.00002 12.9271 3.50145 13.7822 2.69492 14.2387L2.44842 14.3783C1.83596 14.725 1.52888 15.4497 1.79213 16.1024C1.98358 16.577 2.21048 17.044 2.47374 17.5C2.73723 17.9564 3.0285 18.3868 3.34416 18.7902C3.77773 19.3443 4.5588 19.4406 5.16498 19.0834L5.40839 18.9399C6.20714 18.4692 7.19739 18.4648 8.0003 18.9284C8.80291 19.3918 9.29417 20.2511 9.28627 21.1778L9.28386 21.4601C9.27787 22.1629 9.75107 22.7906 10.4468 22.8903C11.4692 23.0368 12.5154 23.0404 13.5537 22.8927C14.2499 22.7936 14.7231 22.1653 14.7169 21.462L14.7143 21.1785C14.7061 20.2514 15.1974 19.3916 16.0003 18.928C16.8029 18.4647 17.7927 18.4689 18.5914 18.9391L18.8363 19.0833C19.4425 19.4402 20.2234 19.3444 20.6574 18.7907C21.3044 17.9654 21.8242 17.0575 22.2084 16.0988C22.4698 15.4465 22.1627 14.7231 21.551 14.3772L21.306 14.2386C20.499 13.7822 20 12.9268 20 11.9997C20 11.0729 20.4986 10.2178 21.3051 9.76126L21.5516 9.62174C22.1641 9.27506 22.4712 8.55029 22.2079 7.89761C22.0165 7.42297 21.7896 6.95598 21.5263 6.50001C21.2628 6.04362 20.9715 5.61325 20.6559 5.20982C20.2223 4.65568 19.4412 4.55944 18.8351 4.91665L18.5916 5.06009C17.7929 5.53078 16.8026 5.53519 15.9997 5.07163C15.1971 4.60825 14.7059 3.74891 14.7138 2.82218L14.7162 2.53994C14.7222 1.83708 14.249 1.20945 13.5532 1.10973C12.5308 0.963214 11.4846 0.959581 10.4464 1.10733C9.75011 1.20641 9.27691 1.83473 9.28317 2.53798L9.28569 2.82154C9.29395 3.74862 8.80264 4.60841 7.99973 5.07197ZM14 15.4641C15.9132 14.3595 16.5687 11.9132 15.4641 9.99999C14.3595 8.08682 11.9132 7.43132 10 8.53589C8.08684 9.64046 7.43134 12.0868 8.53591 14C9.64048 15.9132 12.0868 16.5687 14 15.4641Z</StreamGeometry>
</UserControl.Resources> </UserControl.Resources>
<Panel> <Panel>
<Panel.Styles> <Panel.Styles>
@@ -27,7 +28,7 @@
</Panel.Styles> </Panel.Styles>
<Grid <Grid
Classes.Blur="{Binding $parent[u:UrsaWindow].(u:OverlayDialogHost.IsInModalStatus)}" Classes.Blur="{Binding $parent[u:UrsaWindow].(u:OverlayDialogHost.IsInModalStatus)}"
ColumnDefinitions="Auto, *" > ColumnDefinitions="Auto, *">
<Border <Border
Padding="8 4" Padding="8 4"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
@@ -63,7 +64,7 @@
Margin="8,0,0,0" Margin="8,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.IsNotNull}}" IsVisible="{Binding Status, Converter={x:Static ObjectConverters.IsNotNull}}"
Header="{Binding Status}"/> Header="{Binding Status}" />
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</u:NavMenu.HeaderTemplate> </u:NavMenu.HeaderTemplate>
@@ -85,6 +86,35 @@
Theme="{DynamicResource TitleTextBlock}" /> Theme="{DynamicResource TitleTextBlock}" />
</DockPanel> </DockPanel>
</u:NavMenu.Header> </u:NavMenu.Header>
<u:NavMenu.Footer>
<u:IconButton
Theme="{DynamicResource BorderlessIconButton}"
Classes="Tertiary"
HorizontalAlignment="Stretch">
<TextBlock
Text="Settings"
IsVisible="{Binding !#menu.IsHorizontalCollapsed}" />
<u:IconButton.Icon>
<PathIcon
Width="16"
Height="16"
Data="{StaticResource SettingIcon}" />
</u:IconButton.Icon>
<Button.Flyout>
<Flyout Placement="RightEdgeAlignedBottom">
<u:Form LabelPosition="Left">
<ComboBox
u:FormItem.Label="ThemeVariant"
MinWidth="100"
PlaceholderText="Select a theme"
DisplayMemberBinding="{Binding Name}"
ItemsSource="{Binding Themes}"
SelectedItem="{Binding SelectedTheme}" />
</u:Form>
</Flyout>
</Button.Flyout>
</u:IconButton>
</u:NavMenu.Footer>
</u:NavMenu> </u:NavMenu>
</Border> </Border>
<ContentControl <ContentControl
@@ -97,4 +127,4 @@
</ContentControl> </ContentControl>
</Grid> </Grid>
</Panel> </Panel>
</UserControl> </UserControl>

View File

@@ -4,10 +4,10 @@
xmlns:u="https://irihi.tech/ursa"> xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner"> <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
<Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
<Setter Property="u:Banner.BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
<Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="u:Banner.Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:Banner"> <ControlTemplate TargetType="u:Banner">
<Border <Border
Name="PART_Container" Name="PART_Container"

View File

@@ -31,7 +31,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding Icon}" Content="{TemplateBinding Icon}"
ContentTemplate="{TemplateBinding IconTemplate}" ContentTemplate="{TemplateBinding IconTemplate}"
Foreground="{DynamicResource SemiColorText2}" Foreground="{DynamicResource BreadcrumbItemForeground}"
IsVisible="{TemplateBinding Icon, IsVisible="{TemplateBinding Icon,
Converter={x:Static ObjectConverters.IsNotNull}}" /> Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
@@ -39,14 +39,14 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Foreground="{DynamicResource SemiColorText2}" Foreground="{DynamicResource BreadcrumbItemForeground}"
IsVisible="{TemplateBinding Content, IsVisible="{TemplateBinding Content,
Converter={x:Static ObjectConverters.IsNotNull}}" /> Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
Name="Separator" Name="Separator"
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding Separator}" Content="{TemplateBinding Separator}"
Foreground="{DynamicResource SemiColorText3}"> Foreground="{DynamicResource BreadcrumbItemSeparatorForeground}">
<ContentPresenter.IsVisible> <ContentPresenter.IsVisible>
<TemplateBinding Converter="{x:Static ObjectConverters.IsNotNull}" Property="Separator" /> <TemplateBinding Converter="{x:Static ObjectConverters.IsNotNull}" Property="Separator" />
</ContentPresenter.IsVisible> </ContentPresenter.IsVisible>
@@ -56,20 +56,20 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^ /template/ ContentPresenter#PART_IconPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
<Setter Property="Margin" Value="0 0 4 0"></Setter> <Setter Property="Margin" Value="0 0 4 0" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#Separator"> <Style Selector="^ /template/ ContentPresenter#Separator">
<Setter Property="Margin" Value="4 0"></Setter> <Setter Property="Margin" Value="4 0" />
</Style> </Style>
<Style Selector="^[IsReadOnly=False]"> <Style Selector="^[IsReadOnly=False]">
<Setter Property="Cursor" Value="Hand"></Setter> <Setter Property="Cursor" Value="Hand" />
</Style> </Style>
<Style Selector="^:last"> <Style Selector="^:last">
<Style Selector="^ /template/ ContentPresenter#PART_IconPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
<Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" /> <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#Separator"> <Style Selector="^ /template/ ContentPresenter#Separator">
@@ -77,19 +77,19 @@
</Style> </Style>
<Style Selector="^[IsReadOnly=False]:pointerover"> <Style Selector="^[IsReadOnly=False]:pointerover">
<Style Selector="^ /template/ ContentPresenter#PART_IconPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
</Style> </Style>
</Style> </Style>
</Style> </Style>
<Style Selector="^[IsReadOnly=False]:pointerover"> <Style Selector="^[IsReadOnly=False]:pointerover">
<Style Selector="^ /template/ ContentPresenter#PART_IconPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" /> <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>

View File

@@ -16,13 +16,13 @@
<Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultBackground}" />
<Setter Property="CornerRadius" Value="3" /> <Setter Property="CornerRadius" Value="3" />
<Setter Property="ClipToBounds" Value="True" /> <Setter Property="ClipToBounds" Value="True" />
<Setter Property="u:ButtonGroup.ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" /> <Setter Property="ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
<Setter Property="u:ButtonGroup.ItemsPanel"> <Setter Property="ItemsPanel">
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" /> <StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</Setter> </Setter>
<Setter Property="u:ButtonGroup.Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ButtonGroup"> <ControlTemplate TargetType="u:ButtonGroup">
<Border <Border
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@@ -43,7 +43,7 @@
<Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" /> <Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" />
<Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" /> <Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Button.Template"> <Setter Property="Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<Rectangle <Rectangle

View File

@@ -14,6 +14,7 @@
<Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" />
<Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" /> <Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" />
<Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" /> <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
@@ -43,6 +44,7 @@
<Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" /> <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
<Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" />
<Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
<Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
</Style> </Style>
<Style Selector="^:today"> <Style Selector="^:today">
@@ -143,7 +145,7 @@
<ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton"> <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
<Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight }" /> <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight}" />
<Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" /> <Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" />
<Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" /> <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />

View File

@@ -5,7 +5,7 @@
xmlns:u="https://irihi.tech/ursa"> xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock"> <ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock">
<Setter Property="HandBrush" Value="{DynamicResource SemiGrey6}"/> <Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}"/>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:Clock"> <ControlTemplate TargetType="u:Clock">
<Grid> <Grid>
@@ -13,8 +13,8 @@
ShowHourTicks="{TemplateBinding ShowHourTicks}" ShowHourTicks="{TemplateBinding ShowHourTicks}"
ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}" ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
HourTickForeground="{DynamicResource SemiGrey6}" HourTickForeground="{DynamicResource ClockHourTickForeground}"
MinuteTickForeground="{DynamicResource SemiGrey4}" /> MinuteTickForeground="{DynamicResource ClockMinuteTickForeground}" />
<UniformGrid Rows="2" IsVisible="{TemplateBinding ShowHourHand}"> <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowHourHand}">
<Border <Border
Width="16" Width="16"
@@ -51,8 +51,8 @@
<Ellipse <Ellipse
Width="20" Width="20"
Height="20" Height="20"
Fill="White" Fill="{DynamicResource ClockArborFill}"
Stroke="{DynamicResource SemiBlue5}" Stroke="{DynamicResource ClockArborStroke}"
StrokeThickness="3" /> StrokeThickness="3" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>

View File

@@ -7,7 +7,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:DisableContainer"> <ControlTemplate TargetType="u:DisableContainer">
<Panel> <Panel>
<ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter> <ContentPresenter Content="{TemplateBinding Content}" />
<iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/> <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/>
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>

View File

@@ -9,28 +9,28 @@
</Design.PreviewWith> </Design.PreviewWith>
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}"> <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
<Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" /> <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
<Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" /> <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
<Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}"> <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
<Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" /> <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
<Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" /> <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
<Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}"> <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
<Setter Property="ContentPresenter.Content" Value="{TemplateBinding Content}" /> <Setter Property="Content" Value="{TemplateBinding Content}" />
<Setter Property="ContentPresenter.Background" Value="{TemplateBinding Background}" /> <Setter Property="Background" Value="{TemplateBinding Background}" />
<Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" /> <Setter Property="Foreground" Value="{TemplateBinding Foreground}" />
<Setter Property="ContentPresenter.ContentTemplate" Value="{TemplateBinding ContentTemplate}" /> <Setter Property="ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
<Setter Property="TextElement.FontFamily" Value="{TemplateBinding FontFamily}" /> <Setter Property="FontFamily" Value="{TemplateBinding FontFamily}" />
<Setter Property="TextElement.FontWeight" Value="{TemplateBinding FontWeight}" /> <Setter Property="FontWeight" Value="{TemplateBinding FontWeight}" />
<Setter Property="TextElement.FontSize" Value="{TemplateBinding FontSize}" /> <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
<Setter Property="ContentPresenter.Margin" Value="{DynamicResource ThicknessDividerTextMargin}" /> <Setter Property="Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</ControlTheme> </ControlTheme>
@@ -123,4 +123,4 @@
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -4,19 +4,19 @@
xmlns:u="https://irihi.tech/ursa" xmlns:u="https://irihi.tech/ursa"
xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa"> xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
<ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge"> <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
<Setter Property="u:DualBadge.CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
<Setter Property="u:DualBadge.FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
<Setter Property="u:DualBadge.IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" /> <Setter Property="IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
<Setter Property="u:DualBadge.HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" /> <Setter Property="HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
<Setter Property="u:DualBadge.HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" /> <Setter Property="HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
<Setter Property="u:DualBadge.Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" /> <Setter Property="Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
<Setter Property="u:DualBadge.Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" /> <Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
<Setter Property="u:DualBadge.ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" /> <Setter Property="ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
<Setter Property="u:DualBadge.HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" /> <Setter Property="HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
<Setter Property="u:DualBadge.VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" /> <Setter Property="VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
<Setter Property="u:DualBadge.UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" /> <Setter Property="UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
<Setter Property="u:DualBadge.Padding" Value="{DynamicResource DualBadgeDefaultPadding}" /> <Setter Property="Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
<Setter Property="u:DualBadge.Template"> <Setter Property="Template">
<ControlTemplate TargetType="{x:Type u:DualBadge}"> <ControlTemplate TargetType="{x:Type u:DualBadge}">
<Border <Border
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"

View File

@@ -21,14 +21,14 @@
<Style Selector="^[DisplayDescription=True] /template/ ComboBox"> <Style Selector="^[DisplayDescription=True] /template/ ComboBox">
<Setter Property="ItemTemplate"> <Setter Property="ItemTemplate">
<DataTemplate x:DataType="u:EnumItemTuple"> <DataTemplate x:DataType="u:EnumItemTuple">
<TextBlock Text="{Binding DisplayName}"></TextBlock> <TextBlock Text="{Binding DisplayName}" />
</DataTemplate> </DataTemplate>
</Setter> </Setter>
</Style> </Style>
<Style Selector="^[DisplayDescription=False] /template/ ComboBox"> <Style Selector="^[DisplayDescription=False] /template/ ComboBox">
<Setter Property="ItemTemplate"> <Setter Property="ItemTemplate">
<DataTemplate x:DataType="u:EnumItemTuple"> <DataTemplate x:DataType="u:EnumItemTuple">
<TextBlock Text="{Binding Value}"></TextBlock> <TextBlock Text="{Binding Value}" />
</DataTemplate> </DataTemplate>
</Setter> </Setter>
</Style> </Style>

View File

@@ -38,7 +38,7 @@
Height="1" Height="1"
Margin="0,8" Margin="0,8"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Fill="{DynamicResource SemiColorBorder}" Fill="{DynamicResource FormGroupForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" /> IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
<ItemsPresenter <ItemsPresenter
ItemsPanel="{TemplateBinding ItemsPanel}" /> ItemsPanel="{TemplateBinding ItemsPanel}" />
@@ -64,7 +64,7 @@
FontWeight="{DynamicResource TextBlockTitleFontWeight}" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
Target="{Binding #PART_ContentPresenter.Content}" /> Target="{Binding #PART_ContentPresenter.Content}" />
<TextBlock <TextBlock
Foreground="{DynamicResource SemiRed6}" Foreground="{DynamicResource FormAsteriskForeground}"
IsVisible="{TemplateBinding IsRequired}" IsVisible="{TemplateBinding IsRequired}"
Text="*" /> Text="*" />
</StackPanel> </StackPanel>
@@ -100,7 +100,7 @@
FontWeight="{DynamicResource TextBlockTitleFontWeight}" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
Target="{Binding #PART_ContentPresenter.Content}" /> Target="{Binding #PART_ContentPresenter.Content}" />
<TextBlock <TextBlock
Foreground="{DynamicResource SemiRed6}" Foreground="{DynamicResource FormAsteriskForeground}"
IsVisible="{TemplateBinding IsRequired}" IsVisible="{TemplateBinding IsRequired}"
Text="*" /> Text="*" />
</StackPanel> </StackPanel>

View File

@@ -30,20 +30,21 @@
Header="Clear" /> Header="Clear" />
</MenuFlyout> </MenuFlyout>
<ControlTheme x:Key="{x:Type u:IPv4Box}" TargetType="{x:Type u:IPv4Box}"> <ControlTheme x:Key="{x:Type u:IPv4Box}" TargetType="{x:Type u:IPv4Box}">
<Setter Property="u:IPv4Box.Focusable" Value="True" /> <Setter Property="Focusable" Value="True" />
<Setter Property="u:IPv4Box.ShowLeadingZero" Value="True" /> <Setter Property="ShowLeadingZero" Value="True" />
<Setter Property="u:IPv4Box.TextAlignment" Value="Center" /> <Setter Property="TextAlignment" Value="Center" />
<Setter Property="u:IPv4Box.HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="u:IPv4Box.CornerRadius" Value="{DynamicResource IPv4BoxCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="u:IPv4Box.Background" Value="{DynamicResource IPv4BoxBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="u:IPv4Box.MinHeight" Value="{DynamicResource IPv4BoxDefaultMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="u:IPv4Box.BorderThickness" Value="{DynamicResource IPv4BoxBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="u:IPv4Box.SelectionBrush" Value="{DynamicResource IPv4BoxSelectionBrush}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="u:IPv4Box.SelectionForegroundBrush" Value="{DynamicResource IPv4BoxSelectionForeground}" /> <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="u:IPv4Box.CaretBrush" Value="{DynamicResource IPv4BoxCaretBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="u:IPv4Box.ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" /> <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="FocusAdorner" Value="{x:Null}"></Setter> <Setter Property="ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
<Setter Property="u:IPv4Box.Template"> <Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="Template">
<ControlTemplate TargetType="u:IPv4Box"> <ControlTemplate TargetType="u:IPv4Box">
<Border <Border
Name="PART_Border" Name="PART_Border"
@@ -113,17 +114,20 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover /template/ Border#PART_Border"> <Style Selector="^:pointerover /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource IPv4BoxPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
</Style> </Style>
<Style Selector="^:pressed /template/ Border#PART_Border"> <Style Selector="^:pressed /template/ Border#PART_Border">
<Setter Property="Background" Value="{DynamicResource IPv4BoxPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource IPv4BoxPressedBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:focus-within"> <Style Selector="^:focus-within">
<Setter Property="Border.BorderBrush" Value="{DynamicResource IPv4BoxFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Background" Value="{DynamicResource IPv4BoxDisabledBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
<Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -109,7 +109,7 @@
</Style> </Style>
<Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Margin" Value="0"></Setter> <Setter Property="Margin" Value="0" />
</Style> </Style>
<Style Selector="^:right"> <Style Selector="^:right">

View File

@@ -7,13 +7,12 @@
<converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" /> <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
<ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput"> <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
<Setter Property="MinWidth" Value="{DynamicResource KeyGestureInputWidth}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="MinHeight" Value="{DynamicResource KeyGestureInputHeight}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="Background" Value="{DynamicResource KeyGestureInputBackground}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputBorderBrush}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="BorderThickness" Value="{DynamicResource KeyGestureInputBorderThickness}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="CornerRadius" Value="{DynamicResource KeyGestureInputCornerRadius}" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
<Setter Property="Padding" Value="8 0" /> <Setter Property="Padding" Value="8 0" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:KeyGestureInput"> <ControlTemplate TargetType="u:KeyGestureInput">
@@ -67,18 +66,18 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover /template/ Border#Background"> <Style Selector="^:pointerover /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource KeyGestureInputPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
</Style> </Style>
<Style Selector="^:pressed /template/ Border#Background"> <Style Selector="^:pressed /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
</Style> </Style>
<Style Selector="^:focus /template/ Border#Background"> <Style Selector="^:focus /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:focus-within /template/ Border#Background"> <Style Selector="^:focus-within /template/ Border#Background">
<Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:not(:empty).clearButton, ^:not(:empty).ClearButton"> <Style Selector="^:not(:empty).clearButton, ^:not(:empty).ClearButton">
<Style Selector="^:focus /template/ Button#PART_ClearButton"> <Style Selector="^:focus /template/ Button#PART_ClearButton">

View File

@@ -7,7 +7,7 @@
<!-- Add Resources Here --> <!-- Add Resources Here -->
<converters:BrushToColorConverter x:Key="BrushToColorConverter" /> <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
<ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon"> <ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon">
<Setter Property="IsLoading" Value="True"></Setter> <Setter Property="IsLoading" Value="True" />
<Setter Property="Foreground" Value="{DynamicResource LoadingIconForeground}" /> <Setter Property="Foreground" Value="{DynamicResource LoadingIconForeground}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:LoadingIcon"> <ControlTemplate TargetType="u:LoadingIcon">

View File

@@ -155,7 +155,7 @@
<ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl"> <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
<Setter Property="CornerRadius" Value="12" /> <Setter Property="CornerRadius" Value="12" />
<Setter Property="Padding" Value="48 24" /> <Setter Property="Padding" Value="48 24" />
<Setter Property="u:DialogControlBase.CanDragMove" Value="True"></Setter> <Setter Property="u:DialogControlBase.CanDragMove" Value="True" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:MessageBoxControl"> <ControlTemplate TargetType="u:MessageBoxControl">
<Border <Border

View File

@@ -8,10 +8,10 @@
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="MaxDropdownHeight" Value="300" /> <Setter Property="MaxDropdownHeight" Value="300" />
<Setter Property="MaxSelectionBoxHeight" Value="270"></Setter> <Setter Property="MaxSelectionBoxHeight" Value="270" />
<Setter Property="MinHeight" Value="32" /> <Setter Property="MinHeight" Value="32" />
<Setter Property="Padding" Value="12 4" /> <Setter Property="Padding" Value="12 4" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
@@ -267,11 +267,13 @@
<!-- Pointerover State --> <!-- Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
</Style> </Style>
<!-- Pressed State --> <!-- Pressed State -->
<Style Selector="^:pressed"> <Style Selector="^:pressed">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
</Style> </Style>

View File

@@ -19,11 +19,10 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
AllowAutoHide="True" AllowAutoHide="True"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="Auto">
<ScrollViewer.Styles> <ScrollViewer.Styles>
<Style Selector="ScrollViewer /template/ ScrollBar"> <Style Selector="ScrollViewer /template/ ScrollBar">
<Setter Property="Opacity" Value="0"></Setter> <Setter Property="Opacity" Value="0" />
</Style> </Style>
<Style Selector="ScrollViewer:pointerover"> <Style Selector="ScrollViewer:pointerover">
<Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar"> <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
@@ -40,11 +39,11 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:not(:horizontal-collapsed)"> <Style Selector="^:not(:horizontal-collapsed)">
<Setter Property="Width" Value="{Binding $self.ExpandWidth}"></Setter> <Setter Property="Width" Value="{Binding $self.ExpandWidth}" />
</Style> </Style>
<Style Selector="^:horizontal-collapsed"> <Style Selector="^:horizontal-collapsed">
<Setter Property="Width" Value="{Binding $self.CollapseWidth}" /> <Setter Property="Width" Value="{Binding $self.CollapseWidth}" />
<Setter Property="Grid.IsSharedSizeScope" Value="False"></Setter> <Setter Property="Grid.IsSharedSizeScope" Value="False" />
</Style> </Style>
</ControlTheme> </ControlTheme>
@@ -55,7 +54,8 @@
Grid.Row="0" Grid.Row="0"
MinHeight="32" MinHeight="32"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{TemplateBinding u:NavMenuItem.Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
CornerRadius="4" CornerRadius="4"
Cursor="Hand"> Cursor="Hand">
<Grid <Grid
@@ -149,9 +149,11 @@
</Setter> </Setter>
<Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" /> <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
<Style Selector="^:selected"> <Style Selector="^:selected">
<Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" /> <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" /> <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:vertical-collapsed /template/ ItemsPresenter#PART_ItemsPresenter"> <Style Selector="^:vertical-collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
@@ -165,21 +167,25 @@
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
<Style Selector="^ /template/ Border#PART_Border:pointerover"> <Style Selector="^ /template/ Border#PART_Border:pointerover">
<Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
</Style>
<Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter:pointerover">
<Setter Property="Foreground" Value="{DynamicResource ListBoxItemPointeroverForeground}" />
</Style> </Style>
<Style Selector="^:horizontal-collapsed:first-level"> <Style Selector="^:horizontal-collapsed:first-level">
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Style Selector="^ /template/ Border#PART_Border"> <Style Selector="^ /template/ Border#PART_Border">
<Setter Property="ToolTip.Tip" > <Setter Property="ToolTip.Tip">
<Template> <Template>
<ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}" ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}"></ContentPresenter> <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}"
ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}" />
</Template> </Template>
</Setter> </Setter>
<Setter Property="ToolTip.ShowDelay" Value="0" /> <Setter Property="ToolTip.ShowDelay" Value="0" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
</Style> </Style>
<Style Selector="^ /template/ Border#PART_Border:pointerover"> <Style Selector="^ /template/ Border#PART_Border:pointerover">
<Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_IconPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
<Setter Property="Grid.ColumnSpan" Value="3" /> <Setter Property="Grid.ColumnSpan" Value="3" />
@@ -202,7 +208,7 @@
</Style> </Style>
</Style> </Style>
<Style Selector="^:horizontal-collapsed:first-level"> <Style Selector="^:horizontal-collapsed:first-level">
<Setter Property="Grid.IsSharedSizeScope" Value="True"></Setter> <Setter Property="Grid.IsSharedSizeScope" Value="True" />
</Style> </Style>
<Style Selector="^[IsSeparator=True]"> <Style Selector="^[IsSeparator=True]">
<Setter Property="Template"> <Setter Property="Template">
@@ -218,11 +224,11 @@
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplate="{TemplateBinding HeaderTemplate}"
Foreground="{DynamicResource TextBlockQuaternaryForeground}" Foreground="{DynamicResource TextBlockQuaternaryForeground}"
IsVisible="{TemplateBinding Header, IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}">
Converter={x:Static ObjectConverters.IsNotNull}}">
<ContentPresenter.Styles> <ContentPresenter.Styles>
<Style Selector="TextBlock"> <Style Selector="TextBlock">
<Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" /> <Setter Property="FontSize"
Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
</Style> </Style>
</ContentPresenter.Styles> </ContentPresenter.Styles>
</ContentPresenter> </ContentPresenter>
@@ -231,7 +237,7 @@
Height="{DynamicResource NavigationMenuSeparatorBorderHeight}" Height="{DynamicResource NavigationMenuSeparatorBorderHeight}"
Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}" Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Fill="{DynamicResource SemiColorBorder}" /> Fill="{DynamicResource NavigationMenuItemSeparatorBorderForeground}" />
</StackPanel> </StackPanel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@@ -248,4 +254,4 @@
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -52,7 +52,7 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="TinyPagination" TargetType="{x:Type u:Pagination}"> <ControlTheme x:Key="TinyPagination" TargetType="{x:Type u:Pagination}">
<Setter Property="DisplayCurrentPageInQuickJumper" Value="True"></Setter> <Setter Property="DisplayCurrentPageInQuickJumper" Value="True" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:Pagination"> <ControlTemplate TargetType="u:Pagination">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

View File

@@ -11,6 +11,7 @@
<Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" /> <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="FocusAdorner" Value="{x:Null}" /> <Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="Template"> <Setter Property="Template">
@@ -20,6 +21,7 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<TextPresenter <TextPresenter

View File

@@ -6,7 +6,7 @@
<ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton"> <ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton">
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="Cursor" Value="Hand"></Setter> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Margin" Value="0, 0, 16, 16" /> <Setter Property="Margin" Value="0, 0, 16, 16" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ScrollToButton"> <ControlTemplate TargetType="u:ScrollToButton">
@@ -36,13 +36,13 @@
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style> </Style>
<Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(90deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(90deg)" />
</Style> </Style>
<Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(180deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(180deg)" />
</Style> </Style>
<Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(270deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(270deg)" />
</Style> </Style>
</ControlTheme> </ControlTheme>
@@ -50,7 +50,7 @@
<ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton"> <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="Cursor" Value="Hand"></Setter> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Margin" Value="0, 0, 16, 16" /> <Setter Property="Margin" Value="0, 0, 16, 16" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ScrollToButton"> <ControlTemplate TargetType="u:ScrollToButton">
@@ -80,13 +80,13 @@
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
</Style> </Style>
<Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(90deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(90deg)" />
</Style> </Style>
<Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(180deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(180deg)" />
</Style> </Style>
<Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon"> <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
<Setter Property="RenderTransform" Value="rotate(270deg)"></Setter> <Setter Property="RenderTransform" Value="rotate(270deg)" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -10,11 +10,11 @@
Margin="2" Margin="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource SemiBlue1}" Background="{DynamicResource SelectionListIndicatorBackground}"
Theme="{DynamicResource CardBorder}" /> Theme="{DynamicResource CardBorder}" />
</Template> </Template>
</Setter> </Setter>
<Setter Property="ListBox.Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:SelectionList"> <ControlTemplate TargetType="u:SelectionList">
<Border <Border
Name="border" Name="border"

View File

@@ -30,14 +30,11 @@
Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}" Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
IsHitTestVisible="{TemplateBinding IsLoading}" IsHitTestVisible="{TemplateBinding IsLoading}"
Background="{DynamicResource SkeletonDefaultBackground}" Background="{DynamicResource SkeletonDefaultBackground}"
IsVisible="{TemplateBinding IsLoading}"> IsVisible="{TemplateBinding IsLoading}" />
</iri:PureRectangle>
<iri:PureRectangle <iri:PureRectangle
x:Name="PART_ActiveBorder" x:Name="PART_ActiveBorder"
IsHitTestVisible="{TemplateBinding IsLoading}" IsHitTestVisible="{TemplateBinding IsLoading}"
IsVisible="{TemplateBinding IsLoading}" IsVisible="{TemplateBinding IsLoading}" />
>
</iri:PureRectangle>
</Panel> </Panel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>

View File

@@ -6,7 +6,7 @@
<ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput"> <ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput">
<Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" /> <Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinHeight" Value="{DynamicResource TagInputDefaultHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="ItemTemplate"> <Setter Property="ItemTemplate">
<DataTemplate> <DataTemplate>
@@ -22,8 +22,8 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource TextBoxDefaultBackground}" Background="{DynamicResource TextBoxDefaultBackground}"
BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}" BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}"
BorderThickness="1" BorderThickness="{DynamicResource TextBoxBorderThickness}"
CornerRadius="3"> CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
<Panel HorizontalAlignment="Stretch"> <Panel HorizontalAlignment="Stretch">
<TextBlock <TextBlock
Name="{x:Static u:TagInput.PART_Watermark}" Name="{x:Static u:TagInput.PART_Watermark}"
@@ -49,10 +49,11 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:empty /template/ TextBlock#PART_Watermark"> <Style Selector="^:empty /template/ TextBlock#PART_Watermark">
<Setter Property="IsVisible" Value="True"></Setter> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
<Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder"> <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
<Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
</Style> </Style>
<Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder"> <Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder">
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
@@ -60,13 +61,13 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox"> <ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox">
<Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxInnerForeground}" />
<Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" /> <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="TextBox.Cursor" Value="Ibeam" /> <Setter Property="Cursor" Value="Ibeam" />
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" /> <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" /> <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -106,10 +107,10 @@
<ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag"> <ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag">
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="u:ClosableTag.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ClosableTagForeground}" />
<Setter Property="u:ClosableTag.Background" Value="{DynamicResource ClosableTagBackground}" /> <Setter Property="Background" Value="{DynamicResource ClosableTagBackground}" />
<Setter Property="u:ClosableTag.BorderBrush" Value="{DynamicResource SemiColorBorder}" /> <Setter Property="BorderBrush" Value="{DynamicResource ClosableTagBorder}" />
<Setter Property="u:ClosableTag.BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ClosableTag"> <ControlTemplate TargetType="u:ClosableTag">

View File

@@ -1,79 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
<Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="TextBox.FontSize" Value="14" />
<Setter Property="TextBox.Cursor" Value="Ibeam" />
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
<Setter Property="TextBox.Template">
<ControlTemplate TargetType="TextBox">
<Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
<ContentPresenter
Grid.Column="0"
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
VerticalAlignment="Center"
Content="{TemplateBinding InnerLeftContent}"
Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
<ScrollViewer
Grid.Column="1"
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel>
<TextBlock
Name="PART_Watermark"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
IsVisible="{TemplateBinding Text,
Converter={x:Static StringConverters.IsNullOrEmpty}}"
Opacity="0.5"
Text="{TemplateBinding Watermark}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" />
<TextPresenter
Name="PART_TextPresenter"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
CaretBrush="{TemplateBinding CaretBrush}"
CaretIndex="{TemplateBinding CaretIndex}"
LineHeight="{TemplateBinding LineHeight}"
PasswordChar="{TemplateBinding PasswordChar}"
RevealPassword="{TemplateBinding RevealPassword}"
SelectionBrush="{TemplateBinding SelectionBrush}"
SelectionEnd="{TemplateBinding SelectionEnd}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
SelectionStart="{TemplateBinding SelectionStart}"
Text="{TemplateBinding Text,
Mode=TwoWay}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" />
</Panel>
</ScrollViewer>
<ContentPresenter
Grid.Column="2"
Padding="{DynamicResource TextBoxInnerRightContentPadding}"
VerticalAlignment="Center"
Content="{TemplateBinding InnerRightContent}"
Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Grid>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
</Style>
</ControlTheme>
</ResourceDictionary>

View File

@@ -20,16 +20,16 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:dark /template/ PathIcon#PART_Icon"> <Style Selector="^:dark /template/ PathIcon#PART_Icon">
<Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}"></Setter> <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}" />
<Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}"></Setter> <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}" />
</Style> </Style>
<Style Selector="^:light /template/ PathIcon#PART_Icon"> <Style Selector="^:light /template/ PathIcon#PART_Icon">
<Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}"></Setter> <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}" />
<Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}"></Setter> <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}" />
</Style> </Style>
<Style Selector="^ /template/ PathIcon#PART_Icon"> <Style Selector="^ /template/ PathIcon#PART_Icon">
<Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}"></Setter> <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}" />
<Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}"></Setter> <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -1,52 +1,58 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="https://github.com/avaloniaui"
xmlns:u="https://irihi.tech/ursa"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<!-- Add Resources Here --> xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here -->
<Design.PreviewWith> <Design.PreviewWith>
<StackPanel Margin="20"> <StackPanel Margin="20">
<TextBlock Text="Hello World"/> <TextBlock Text="Hello World" />
</StackPanel> </StackPanel>
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}"> <ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}">
<Setter Property="u:TimeBox.Focusable" Value="True"/> <Setter Property="Focusable" Value="True" />
<Setter Property="u:TimeBox.ShowLeadingZero" Value="True"/> <Setter Property="ShowLeadingZero" Value="True" />
<Setter Property="u:TimeBox.TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center" />
<Setter Property="u:TimeBox.HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="u:TimeBox.CornerRadius" Value="{DynamicResource TimeBoxCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="u:TimeBox.Background" Value="{DynamicResource TimeBoxBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="u:TimeBox.MinHeight" Value="{DynamicResource TimeBoxDefaultMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="u:TimeBox.BorderThickness" Value="{DynamicResource TimeBoxBorderThickness}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="u:TimeBox.SelectionBrush" Value="{DynamicResource TimeBoxSelectionBrush}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="u:TimeBox.SelectionForegroundBrush" Value="{DynamicResource TimeBoxSelectionForeground}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="u:TimeBox.CaretBrush" Value="{DynamicResource TimeBoxCaretBrush}" /> <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="u:TimeBox.Template"> <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="Template">
<ControlTemplate TargetType="u:TimeBox"> <ControlTemplate TargetType="u:TimeBox">
<Border Name="PART_Border" <Border
Name="PART_Border"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*"> <Grid Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*">
<Border Name="{x:Static u:TimeBox.PART_HourBorder}" <Border
Grid.Column="0" Name="{x:Static u:TimeBox.PART_HourBorder}"
Background="Transparent" Grid.Column="0"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_HoursTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_HoursTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_HourDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_HourDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -55,25 +61,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text=":" /> Text=":" />
<Border Name="{x:Static u:TimeBox.PART_MinuteBorder}" <Border
Grid.Column="2" Name="{x:Static u:TimeBox.PART_MinuteBorder}"
Background="Transparent" Grid.Column="2"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_MinuteDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_MinuteDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -82,25 +91,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text=":" /> Text=":" />
<Border Name="{x:Static u:TimeBox.PART_SecondBorder}" <Border
Grid.Column="4" Name="{x:Static u:TimeBox.PART_SecondBorder}"
Background="Transparent" Grid.Column="4"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_SecondTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_SecondTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_SecondDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_SecondDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -109,25 +121,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text="." /> Text="." />
<Border Name="{x:Static u:TimeBox.PART_MilliSecondBorder}" <Border
Grid.Column="6" Name="{x:Static u:TimeBox.PART_MilliSecondBorder}"
Background="Transparent" Grid.Column="6"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
@@ -135,20 +150,21 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:focus-within"> <Style Selector="^:focus-within">
<Setter Property="Border.BorderBrush" Value="{DynamicResource TimeBoxFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Background" Value="{DynamicResource TimeBoxDisabledBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
<Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
</Style> </Style>
<Style Selector="^[DragOrientation=Horizontal]"> <Style Selector="^[DragOrientation=Horizontal]">
<Style Selector="^/template/ Panel"> <Style Selector="^/template/ Panel">
<Setter Property="Cursor" Value="SizeWestEast"/> <Setter Property="Cursor" Value="SizeWestEast" />
</Style> </Style>
</Style> </Style>
<Style Selector="^[DragOrientation=Vertical]"> <Style Selector="^[DragOrientation=Vertical]">
<Style Selector="^/template/ Panel"> <Style Selector="^/template/ Panel">
<Setter Property="Cursor" Value="SizeNorthSouth"/> <Setter Property="Cursor" Value="SizeNorthSouth" />
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>

View File

@@ -133,8 +133,7 @@
InnerRightContent="{TemplateBinding InnerRightContent}" InnerRightContent="{TemplateBinding InnerRightContent}"
IsReadOnly="{TemplateBinding IsReadonly}" IsReadOnly="{TemplateBinding IsReadonly}"
Theme="{DynamicResource LooklessTextBox}" Theme="{DynamicResource LooklessTextBox}"
Watermark="{TemplateBinding Watermark}"> Watermark="{TemplateBinding Watermark}" />
</TextBox>
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"

View File

@@ -34,7 +34,7 @@
<ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem"> <ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="u:TimelineItem.Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:TimelineItem"> <ControlTemplate TargetType="u:TimelineItem">
<Grid <Grid
Name="PART_RootGrid" Name="PART_RootGrid"
@@ -79,7 +79,7 @@
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplate="{TemplateBinding HeaderTemplate}"
FontSize="14" FontSize="14"
Foreground="{DynamicResource SemiGrey9}" /> Foreground="{DynamicResource TimelineHeaderForeground}" />
<ContentPresenter <ContentPresenter
Name="{x:Static u:TimelineItem.PART_Content}" Name="{x:Static u:TimelineItem.PART_Content}"
Grid.Row="1" Grid.Row="1"
@@ -148,7 +148,7 @@
<Setter Property="Grid.Column" Value="2" /> <Setter Property="Grid.Column" Value="2" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Margin" Value="8 2 8 12"></Setter> <Setter Property="Margin" Value="8 2 8 12" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:all-right"> <Style Selector="^:all-right">
@@ -169,7 +169,7 @@
<Setter Property="Grid.Column" Value="0" /> <Setter Property="Grid.Column" Value="0" />
<Setter Property="TextAlignment" Value="Right" /> <Setter Property="TextAlignment" Value="Right" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="Margin" Value="8 2 8 12"></Setter> <Setter Property="Margin" Value="8 2 8 12" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:separate"> <Style Selector="^:separate">
@@ -184,7 +184,7 @@
<Setter Property="Grid.Column" Value="2" /> <Setter Property="Grid.Column" Value="2" />
<Setter Property="HorizontalContentAlignment" Value="Left" /> <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Margin" Value="8 2 8 12"></Setter> <Setter Property="Margin" Value="8 2 8 12" />
</Style> </Style>
<Style Selector="^ /template/ TextBlock#PART_Time"> <Style Selector="^ /template/ TextBlock#PART_Time">
<Setter Property="Grid.Row" Value="0" /> <Setter Property="Grid.Row" Value="0" />

View File

@@ -54,7 +54,7 @@
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplate="{TemplateBinding HeaderTemplate}"
DockPanel.Dock="Left" DockPanel.Dock="Left"
Foreground="{DynamicResource SemiColorText2}" Foreground="{DynamicResource ToolBarHeaderForeground}"
IsVisible="{TemplateBinding Header, IsVisible="{TemplateBinding Header,
Converter={x:Static ObjectConverters.IsNotNull}}" /> Converter={x:Static ObjectConverters.IsNotNull}}" />
<Panel Name="PART_PopupButtonPanel" DockPanel.Dock="Right"> <Panel Name="PART_PopupButtonPanel" DockPanel.Dock="Right">
@@ -67,7 +67,7 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Height="12" Height="12"
Foreground="{DynamicResource SemiColorText2}" Foreground="{DynamicResource ToolBarHeaderForeground}"
Data="{DynamicResource ToolBarHorizontalMoreGlyph}" /> Data="{DynamicResource ToolBarHorizontalMoreGlyph}" />
</ToggleButton> </ToggleButton>
<Popup <Popup
@@ -122,7 +122,7 @@
<Rectangle <Rectangle
Name="PART_Rect" Name="PART_Rect"
Margin="4" Margin="4"
Fill="{DynamicResource SemiColorBorder}" /> Fill="{DynamicResource ToolBarSeparatorForeground}" />
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^ /template/ Rectangle#PART_Rect"> <Style Selector="^ /template/ Rectangle#PART_Rect">

View File

@@ -18,6 +18,7 @@
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
@@ -68,7 +69,7 @@
</ContentPresenter> </ContentPresenter>
<ContentPresenter <ContentPresenter
Grid.Column="2" Grid.Column="2"
Margin="0 0 8 0" Margin="0,0,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{TemplateBinding InnerRightContent}" Content="{TemplateBinding InnerRightContent}"
@@ -78,11 +79,11 @@
<Button <Button
Name="PART_ClearButton" Name="PART_ClearButton"
Grid.Column="3" Grid.Column="3"
Command="{Binding $parent[u:TreeComboBox].Clear}"
Margin="0,0,8,0" Margin="0,0,8,0"
Command="{Binding $parent[u:TreeComboBox].Clear}"
Content="{DynamicResource IconButtonClearData}"
IsVisible="False" IsVisible="False"
Theme="{DynamicResource InnerIconButton}" Theme="{DynamicResource InnerIconButton}" />
Content="{DynamicResource IconButtonClearData}" />
<PathIcon <PathIcon
x:Name="DropDownGlyph" x:Name="DropDownGlyph"
@@ -94,8 +95,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource ComboBoxIcon}" Data="{DynamicResource ComboBoxIcon}"
Foreground="{DynamicResource ComboBoxIconDefaultForeground}" Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
UseLayoutRounding="False" IsHitTestVisible="True"
IsHitTestVisible="True" /> UseLayoutRounding="False" />
<Popup <Popup
Name="{x:Static iri:PartNames.PART_Popup}" Name="{x:Static iri:PartNames.PART_Popup}"
@@ -111,27 +112,27 @@
<Border <Border
Name="PopupBorder" Name="PopupBorder"
Margin="0,4" Margin="0,4"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
Background="{DynamicResource ComboBoxPopupBackground}" Background="{DynamicResource ComboBoxPopupBackground}"
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}" BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}" BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
ClipToBounds="True" ClipToBounds="True"
CornerRadius="6"> CornerRadius="6">
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<ContentPresenter <ContentPresenter
Name="PART_PopupHeader" Name="PART_PopupHeader"
Margin="8,8 8 0" Margin="8,8,8,0"
IsVisible="{TemplateBinding PopupInnerTopContent,
Converter={x:Static ObjectConverters.IsNotNull}}"
Content="{TemplateBinding PopupInnerTopContent}" Content="{TemplateBinding PopupInnerTopContent}"
DockPanel.Dock="Top" /> DockPanel.Dock="Top"
IsVisible="{TemplateBinding PopupInnerTopContent,
Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
Name="PART_PopupFooter" Name="PART_PopupFooter"
Margin="8 0 8 8" Margin="8,0,8,8"
IsVisible="{TemplateBinding PopupInnerBottomContent,
Converter={x:Static ObjectConverters.IsNotNull}}"
Content="{TemplateBinding PopupInnerBottomContent}" Content="{TemplateBinding PopupInnerBottomContent}"
DockPanel.Dock="Bottom" /> DockPanel.Dock="Bottom"
IsVisible="{TemplateBinding PopupInnerBottomContent,
Converter={x:Static ObjectConverters.IsNotNull}}" />
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"> <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}">
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" /> <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
</ScrollViewer> </ScrollViewer>
@@ -141,23 +142,23 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.clearButton, ^.ClearButton"> <Style Selector="^.clearButton, ^.ClearButton">
<Style Selector="^:pointerover /template/ Button#PART_ClearButton"> <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
<Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}"/> <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Style> </Style>
<Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph"> <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
<Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/> <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^.Large"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}"/> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
</Style> </Style>
<Style Selector="^.Small"> <Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}"/> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
</Style> </Style>
<!-- Pointerover State --> <!-- Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
@@ -217,7 +218,7 @@
<Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
<Setter Property="CornerRadius" Value="3" /> <Setter Property="CornerRadius" Value="3" />
<Setter Property="MinHeight" Value="32"></Setter> <Setter Property="MinHeight" Value="32" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:TreeComboBoxItem"> <ControlTemplate TargetType="u:TreeComboBoxItem">
@@ -265,7 +266,6 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<!-- Pointerover state -->
<Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover"> <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
<Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
</Style> </Style>
@@ -287,6 +287,12 @@
<Style Selector="^:selected /template/ Border#PART_LayoutRoot"> <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
<Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
</Style> </Style>
<Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
</Style>
<Style Selector="^:selected /template/ ToggleButton#PART_ExpandCollapseChevron">
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
</Style>
<!-- Disabled Selected state --> <!-- Disabled Selected state -->
<Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot"> <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">

View File

@@ -8,10 +8,10 @@
<Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" /> <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
<Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" /> <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
<Setter Property="StrokeThickness" Value="0.4" /> <Setter Property="StrokeThickness" Value="0.4" />
<Setter Property="Foreground" Value="{DynamicResource SemiBlue2}" /> <Setter Property="Foreground" Value="{DynamicResource TwoTonePathIconForeground}" />
<Setter Property="StrokeBrush" Value="{DynamicResource SemiBlue6}" /> <Setter Property="StrokeBrush" Value="{DynamicResource TwoTonePathIconStrokeBrush}" />
<Setter Property="ActiveForeground" Value="{DynamicResource SemiBlue6}" /> <Setter Property="ActiveForeground" Value="{DynamicResource TwoTonePathIconActiveForeground}" />
<Setter Property="ActiveStrokeBrush" Value="{DynamicResource SemiBlue6}" /> <Setter Property="ActiveStrokeBrush" Value="{DynamicResource TwoTonePathIconActiveStrokeBrush}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:TwoTonePathIcon"> <ControlTemplate TargetType="u:TwoTonePathIcon">
<Border Background="{TemplateBinding Background}"> <Border Background="{TemplateBinding Background}">

View File

@@ -41,7 +41,6 @@
<ResourceInclude Source="ScrollToButton.axaml" /> <ResourceInclude Source="ScrollToButton.axaml" />
<ResourceInclude Source="SelectionList.axaml" /> <ResourceInclude Source="SelectionList.axaml" />
<ResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<ResourceInclude Source="TextBox.axaml" />
<ResourceInclude Source="ThemeSelector.axaml" /> <ResourceInclude Source="ThemeSelector.axaml" />
<ResourceInclude Source="TimePicker.axaml" /> <ResourceInclude Source="TimePicker.axaml" />
<ResourceInclude Source="TimeRangePicker.axaml" /> <ResourceInclude Source="TimeRangePicker.axaml" />

View File

@@ -1,9 +1,14 @@
<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:semi="https://irihi.tech/ursa/themes/semi">
<Styles.Resources> <Styles.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceInclude x:Key="Dark" Source="./Themes/Dark/_index.axaml" /> <ResourceInclude x:Key="Dark" Source="./Themes/Dark/_index.axaml" />
<ResourceInclude x:Key="Light" Source="./Themes/Light/_index.axaml" /> <ResourceInclude x:Key="Light" Source="./Themes/Light/_index.axaml" />
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="./Themes/HighContrast/Aquatic.axaml" />
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="./Themes/HighContrast/Desert.axaml" />
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Dust}" Source="./Themes/HighContrast/Dusk.axaml" />
<ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="./Themes/HighContrast/NightSky.axaml" />
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Controls/_index.axaml" /> <ResourceInclude Source="../Controls/_index.axaml" />

View File

@@ -11,6 +11,11 @@ namespace Ursa.Themes.Semi;
/// </summary> /// </summary>
public class SemiTheme: Styles public class SemiTheme: Styles
{ {
public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark);
public static ThemeVariant Desert => new ThemeVariant(nameof(Desert), ThemeVariant.Light);
public static ThemeVariant Dust => new ThemeVariant(nameof(Dust), ThemeVariant.Dark);
public static ThemeVariant NightSky => new ThemeVariant(nameof(NightSky), ThemeVariant.Dark);
private static readonly Lazy<Dictionary<CultureInfo, ResourceDictionary>> _localeToResource = new Lazy<Dictionary<CultureInfo, ResourceDictionary>>( private static readonly Lazy<Dictionary<CultureInfo, ResourceDictionary>> _localeToResource = new Lazy<Dictionary<CultureInfo, ResourceDictionary>>(
() => new Dictionary<CultureInfo, ResourceDictionary> () => new Dictionary<CultureInfo, ResourceDictionary>
{ {

View File

@@ -10,4 +10,5 @@
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" /> <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" /> <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
<SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="BreadcrumbItemForeground" Opacity="0.6" Color="#F9F9F9" />
<SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#F9F9F9" />
<SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#54A9FF" />
</ResourceDictionary>

View File

@@ -0,0 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ClockHandBrush" Color="#A7ABB0" />
<SolidColorBrush x:Key="ClockHourTickForeground" Color="#A7ABB0" />
<SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#6B7075" />
<SolidColorBrush x:Key="ClockArborFill" Color="White" />
<SolidColorBrush x:Key="ClockArborStroke" Color="#54A9FF" />
</ResourceDictionary>

View File

@@ -1,5 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2" />
<!-- Add Resources Here --> </ResourceDictionary>
<SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2"></SolidColorBrush>
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="FormGroupForeground" Opacity="0.08" Color="White" />
<SolidColorBrush x:Key="FormAsteriskForeground" Color="#FD9983" />
</ResourceDictionary>

View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="IPv4BoxBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="IPv4BoxPointeroverBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="IPv4BoxPressedBackground" Opacity="0.2" Color="White" />
<SolidColorBrush x:Key="IPv4BoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="IPv4BoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="IPv4BoxFocusBorderBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="IPv4BoxSelectionBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="IPv4BoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="IPv4BoxCaretBrush" Color="White" />
</ResourceDictionary>

View File

@@ -1,9 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="KeyGestureInputBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="KeyGestureInputPointeroverBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="KeyGestureInputPressedBackground" Opacity="0.2" Color="White" />
<SolidColorBrush x:Key="KeyGestureInputBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="KeyGestureInputDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="KeyGestureInputFocusBorderBrush" Color="#FF54A9FF" />
</ResourceDictionary>

View File

@@ -1,9 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
<SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#54A9FF" />
<SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" /> <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
<SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="White" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FF0A4694"></SolidColorBrush>
</ResourceDictionary>

View File

@@ -1,4 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" /> <SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" />
</ResourceDictionary> <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA" />
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White" />
</ResourceDictionary>

View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.2" Color="White" />
<SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="TimeBoxCaretBrush" Color="White" />
</ResourceDictionary>

View File

@@ -1,9 +1,9 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <SolidColorBrush x:Key="TimelineHeaderForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.2" Color="White" /> <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.2" Color="White" />
<SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF54A9FF" /> <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF54A9FF" />
<SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF5DC264" /> <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF5DC264" />
<SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFFAE43" /> <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFFAE43" />
<SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFFC725A" /> <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFFC725A" />
<SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.2" Color="White" /> <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.2" Color="White" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
<SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="White" />
</ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="TwoTonePathIconForeground" Color="#135CB8"/>
<SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#7FC1FF"/>
<SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#7FC1FF"/>
<SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#7FC1FF"/>
</ResourceDictionary>

View File

@@ -1,24 +1,27 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<MergeResourceInclude Source="Avatar.axaml" /> <ResourceInclude Source="Avatar.axaml" />
<MergeResourceInclude Source="Badge.axaml" /> <ResourceInclude Source="Badge.axaml" />
<MergeResourceInclude Source="Banner.axaml" /> <ResourceInclude Source="Banner.axaml" />
<MergeResourceInclude Source="ButtonGroup.axaml" /> <ResourceInclude Source="Breadcrumb.axaml" />
<MergeResourceInclude Source="DatePicker.axaml" /> <ResourceInclude Source="ButtonGroup.axaml" />
<MergeResourceInclude Source="Dialog.axaml" /> <ResourceInclude Source="Clock.axaml" />
<MergeResourceInclude Source="Divider.axaml" /> <ResourceInclude Source="DatePicker.axaml" />
<MergeResourceInclude Source="DualBadge.axaml" /> <ResourceInclude Source="Dialog.axaml" />
<MergeResourceInclude Source="IPv4Box.axaml" /> <ResourceInclude Source="Divider.axaml" />
<MergeResourceInclude Source="KeyGestureInput.axaml" /> <ResourceInclude Source="DualBadge.axaml" />
<MergeResourceInclude Source="Loading.axaml" /> <ResourceInclude Source="Form.axaml" />
<MergeResourceInclude Source="NavigationMenu.axaml" /> <ResourceInclude Source="Loading.axaml" />
<MergeResourceInclude Source="NotificationShared.axaml" /> <ResourceInclude Source="NavigationMenu.axaml" />
<MergeResourceInclude Source="Pagination.axaml" /> <ResourceInclude Source="NotificationShared.axaml" />
<MergeResourceInclude Source="Rating.axaml" /> <ResourceInclude Source="Pagination.axaml" />
<MergeResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="Rating.axaml" />
<MergeResourceInclude Source="Timeline.axaml" /> <ResourceInclude Source="SelectionList.axaml" />
<MergeResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Skeleton.axaml" />
<MergeResourceInclude Source="Skeleton.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<MergeResourceInclude Source="TimeBox.axaml" /> <ResourceInclude Source="Timeline.axaml" />
<ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TwoTonePathIcon.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,13 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="WindowColor">#202020</Color>
<Color x:Key="WindowTextColor">#FFFFFF</Color>
<Color x:Key="HotlightColor">#75E9FC</Color>
<Color x:Key="GrayTextColor">#A6A6A6</Color>
<Color x:Key="HighlightTextColor">#263B50</Color>
<Color x:Key="HighlightColor">#8EE3F0</Color>
<Color x:Key="ButtonTextColor">#FFFFFF</Color>
<Color x:Key="ButtonFaceColor">#202020</Color>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="_index.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -0,0 +1,9 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="BadgeContentForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="BannerInformationBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="BannerBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="BannerInformationBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="BannerCloseButtonForeground" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="BreadcrumbItemForeground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="{StaticResource HighlightColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,32 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
<!-- Light -->
<SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
<!-- end Light -->
<!-- Solid -->
<SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
<!-- end Solid -->
</ResourceDictionary>

View File

@@ -0,0 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ClockHandBrush" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ClockHourTickForeground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="ClockMinuteTickForeground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="ClockArborFill" Color="{StaticResource ButtonFaceColor}" />
<SolidColorBrush x:Key="ClockArborStroke" Color="{StaticResource ButtonTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,41 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--CalenderDayButton-->
<SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
<SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="{StaticResource HotlightColor}" />
<SolidColorBrush x:Key="CalenderDayTodayBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayTodayForeground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="CalenderDayPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
<SolidColorBrush x:Key="CalenderDayBlackoutBackground" Color="Transparent" />
<SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="Transparent" />
<!--CalenderYearButton-->
<SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
<SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="CalenderYearPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderYearPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
<!--CalenderView-->
<SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
</ResourceDictionary>

View File

@@ -0,0 +1,13 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="WindowColor">#FFFAEF</Color>
<Color x:Key="WindowTextColor">#3D3D3D</Color>
<Color x:Key="HotlightColor">#1C5E75</Color>
<Color x:Key="GrayTextColor">#676767</Color>
<Color x:Key="HighlightTextColor">#FFF5E3</Color>
<Color x:Key="HighlightColor">#903909</Color>
<Color x:Key="ButtonTextColor">#202020</Color>
<Color x:Key="ButtonFaceColor">#FFFAEF</Color>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="_index.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -0,0 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,13 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="WindowColor">#2D3236</Color>
<Color x:Key="WindowTextColor">#FFFFFF</Color>
<Color x:Key="HotlightColor">#70EBDE</Color>
<Color x:Key="GrayTextColor">#A6A6A6</Color>
<Color x:Key="HighlightTextColor">#212D3B</Color>
<Color x:Key="HighlightColor">#A1BFDE</Color>
<Color x:Key="ButtonTextColor">#B6F6F0</Color>
<Color x:Key="ButtonFaceColor">#2D3236</Color>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="_index.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="FormGroupForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="FormAsteriskForeground" Color="{StaticResource HighlightColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,13 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="WindowColor">#000000</Color>
<Color x:Key="WindowTextColor">#FFFFFF</Color>
<Color x:Key="HotlightColor">#8080FF</Color>
<Color x:Key="GrayTextColor">#A6A6A6</Color>
<Color x:Key="HighlightTextColor">#2B2B2B</Color>
<Color x:Key="HighlightColor">#D6B4FD</Color>
<Color x:Key="ButtonTextColor">#FFEE32</Color>
<Color x:Key="ButtonFaceColor">#000000</Color>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="_index.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -0,0 +1,9 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="PaginationButtonIconForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="PaginationButtonPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="RatingCharacterForeground" Color="#FDDE43" />
<SolidColorBrush x:Key="RatingCharacterBackground" Opacity="0.12" Color="White" />
</ResourceDictionary>

View File

@@ -0,0 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ClosableTagBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ClosableTagForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ClosableTagBorder" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="TimelineHeaderForeground" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToastCardContentForeground" Color="#F9F9F9" />
<SolidColorBrush x:Key="ToastCardBackground" Color="#43444A" />
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarHeaderForeground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="ToolBarSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="TwoTonePathIconForeground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="{StaticResource ButtonTextColor}" />
<SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="{StaticResource ButtonTextColor}" />
</ResourceDictionary>

View File

@@ -0,0 +1,20 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="Badge.axaml" />
<ResourceInclude Source="Banner.axaml" />
<ResourceInclude Source="Breadcrumb.axaml" />
<ResourceInclude Source="ButtonGroup.axaml" />
<ResourceInclude Source="Clock.axaml" />
<ResourceInclude Source="DatePicker.axaml" />
<ResourceInclude Source="Divider.axaml" />
<ResourceInclude Source="Form.axaml" />
<ResourceInclude Source="NavigationMenu.axaml" />
<ResourceInclude Source="Pagination.axaml" />
<ResourceInclude Source="SelectionList.axaml" />
<ResourceInclude Source="TagInput.axaml" />
<ResourceInclude Source="Timeline.axaml" />
<ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TwoTonePathIcon.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -10,4 +10,5 @@
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" /> <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" /> <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
<SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="BreadcrumbItemForeground" Opacity="0.62" Color="#1C1F23" />
<SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#1C1F23" />
<SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#0077FA" />
</ResourceDictionary>

View File

@@ -0,0 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ClockHandBrush" Color="#555B61" />
<SolidColorBrush x:Key="ClockHourTickForeground" Color="#555B61" />
<SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#888D92" />
<SolidColorBrush x:Key="ClockArborFill" Color="White" />
<SolidColorBrush x:Key="ClockArborStroke" Color="#0077FA" />
</ResourceDictionary>

View File

@@ -1,5 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2" />
<!-- Add Resources Here --> </ResourceDictionary>
<SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2"></SolidColorBrush>
</ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="FormGroupForeground" Opacity="0.08" Color="#1C1F23" />
<SolidColorBrush x:Key="FormAsteriskForeground" Color="#D52515" />
</ResourceDictionary>

View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="IPv4BoxBackground" Opacity="0.05" Color="#FF2E3238" />
<SolidColorBrush x:Key="IPv4BoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
<SolidColorBrush x:Key="IPv4BoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
<SolidColorBrush x:Key="IPv4BoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="IPv4BoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="IPv4BoxFocusBorderBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="IPv4BoxSelectionBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="IPv4BoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="IPv4BoxCaretBrush" Color="Black" />
</ResourceDictionary>

View File

@@ -1,9 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="KeyGestureInputBackground" Opacity="0.05" Color="#FF2E3238" />
<SolidColorBrush x:Key="KeyGestureInputPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
<SolidColorBrush x:Key="KeyGestureInputPressedBackground" Opacity="0.13" Color="#FF2E3238" />
<SolidColorBrush x:Key="KeyGestureInputBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="KeyGestureInputDisabledBackground" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="KeyGestureInputFocusBorderBrush" Color="#FF0077FA" />
</ResourceDictionary>

View File

@@ -1,9 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
<SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
<SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Color="#EAF5FF" />
<SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#0077FA" />
<SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" /> <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
<SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="#1C1F23" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FFCBE7FE"></SolidColorBrush>
</ResourceDictionary>

View File

@@ -1,4 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<SolidColorBrush x:Key="ClosableTagBackground" Color="White" /> <SolidColorBrush x:Key="ClosableTagBackground" Color="White" />
<SolidColorBrush x:Key="ClosableTagForeground" Color="#2E3238"/>
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="#1C1F23"/>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.05" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="TimeBoxCaretBrush" Color="Black" />
</ResourceDictionary>

View File

@@ -1,9 +1,9 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <SolidColorBrush x:Key="TimelineHeaderForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.13" Color="#FF2E3238" /> <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.13" Color="#FF2E3238" />
<SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF0077FA" /> <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF0077FA" />
<SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF3BB346" /> <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF3BB346" />
<SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFC8800" /> <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFC8800" />
<SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFF93920" /> <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFF93920" />
<SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.13" Color="#FF2E3238" /> <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.13" Color="#FF2E3238" />
</ResourceDictionary> </ResourceDictionary>

View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarHeaderForeground" Opacity="0.62" Color="#1C1F23" />
<SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="#1C1F23" />
</ResourceDictionary>

View File

@@ -0,0 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="TwoTonePathIconForeground" Color="#98CDFD"/>
<SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#0062D6"/>
<SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#0062D6"/>
<SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#0062D6"/>
</ResourceDictionary>

View File

@@ -1,24 +1,27 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<MergeResourceInclude Source="Avatar.axaml" /> <ResourceInclude Source="Avatar.axaml" />
<MergeResourceInclude Source="Badge.axaml" /> <ResourceInclude Source="Badge.axaml" />
<MergeResourceInclude Source="Banner.axaml" /> <ResourceInclude Source="Banner.axaml" />
<MergeResourceInclude Source="ButtonGroup.axaml" /> <ResourceInclude Source="Breadcrumb.axaml" />
<MergeResourceInclude Source="DatePicker.axaml" /> <ResourceInclude Source="ButtonGroup.axaml" />
<MergeResourceInclude Source="Dialog.axaml" /> <ResourceInclude Source="Clock.axaml" />
<MergeResourceInclude Source="Divider.axaml" /> <ResourceInclude Source="DatePicker.axaml" />
<MergeResourceInclude Source="DualBadge.axaml" /> <ResourceInclude Source="Dialog.axaml" />
<MergeResourceInclude Source="IPv4Box.axaml" /> <ResourceInclude Source="Divider.axaml" />
<MergeResourceInclude Source="KeyGestureInput.axaml" /> <ResourceInclude Source="DualBadge.axaml" />
<MergeResourceInclude Source="Loading.axaml" /> <ResourceInclude Source="Form.axaml" />
<MergeResourceInclude Source="NavigationMenu.axaml" /> <ResourceInclude Source="Loading.axaml" />
<MergeResourceInclude Source="NotificationShared.axaml" /> <ResourceInclude Source="NavigationMenu.axaml" />
<MergeResourceInclude Source="Pagination.axaml" /> <ResourceInclude Source="NotificationShared.axaml" />
<MergeResourceInclude Source="Rating.axaml" /> <ResourceInclude Source="Pagination.axaml" />
<MergeResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="Rating.axaml" />
<MergeResourceInclude Source="Timeline.axaml" /> <ResourceInclude Source="SelectionList.axaml" />
<MergeResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Skeleton.axaml" />
<MergeResourceInclude Source="Skeleton.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<MergeResourceInclude Source="TimeBox.axaml" /> <ResourceInclude Source="Timeline.axaml" />
<ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TwoTonePathIcon.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -1,8 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:Double x:Key="IPv4BoxDefaultMinHeight">32</x:Double>
<x:Double x:Key="IPv4BoxSmallMinHeight">24</x:Double>
<x:Double x:Key="IPv4BoxLargeMinHeight">40</x:Double>
<Thickness x:Key="IPv4BoxBorderThickness">1</Thickness>
<CornerRadius x:Key="IPv4BoxCornerRadius">3</CornerRadius>
</ResourceDictionary>

View File

@@ -1,7 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:Double x:Key="KeyGestureInputWidth">80</x:Double>
<x:Double x:Key="KeyGestureInputHeight">32</x:Double>
<CornerRadius x:Key="KeyGestureInputCornerRadius">3</CornerRadius>
<Thickness x:Key="KeyGestureInputBorderThickness">1</Thickness>
</ResourceDictionary>

View File

@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry> <StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry>
<x:Double x:Key="TagInputDefaultHeight">32</x:Double>
</ResourceDictionary> </ResourceDictionary>

View File

@@ -1,8 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:Double x:Key="TimeBoxDefaultMinHeight">32</x:Double>
<x:Double x:Key="TimeBoxSmallMinHeight">24</x:Double>
<x:Double x:Key="TimeBoxLargeMinHeight">40</x:Double>
<Thickness x:Key="TimeBoxBorderThickness">1</Thickness>
<CornerRadius x:Key="TimeBoxCornerRadius">3</CornerRadius>
</ResourceDictionary>

View File

@@ -11,8 +11,6 @@
<ResourceInclude Source="Divider.axaml" /> <ResourceInclude Source="Divider.axaml" />
<ResourceInclude Source="Drawer.axaml" /> <ResourceInclude Source="Drawer.axaml" />
<ResourceInclude Source="DualBadge.axaml" /> <ResourceInclude Source="DualBadge.axaml" />
<ResourceInclude Source="IPv4Box.axaml" />
<ResourceInclude Source="KeyGestureInput.axaml" />
<ResourceInclude Source="MessageBox.axaml" /> <ResourceInclude Source="MessageBox.axaml" />
<ResourceInclude Source="NavigationMenu.axaml" /> <ResourceInclude Source="NavigationMenu.axaml" />
<ResourceInclude Source="Notification.axaml" /> <ResourceInclude Source="Notification.axaml" />
@@ -25,6 +23,5 @@
<ResourceInclude Source="ThemeSelector.axaml" /> <ResourceInclude Source="ThemeSelector.axaml" />
<ResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="ToolBar.axaml" /> <ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TimeBox.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>