Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/Ursa.Demo/Pages/AvatarDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<u:Avatar Classes="Yellow" />
<u:Avatar Classes="Amber" />
<u:Avatar Classes="Orange" />
<u:Avatar Classes="Grey" />
<u:Avatar Classes="Gray" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<u:Avatar Classes="ExtraExtraSmall" />
Expand Down
2 changes: 1 addition & 1 deletion demo/Ursa.Demo/Pages/DialogDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<Grid Grid.Column="1">
<Border
Background="{DynamicResource SemiColorBackground1}"
BorderBrush="{DynamicResource SemiGrey1}"
BorderBrush="{DynamicResource SemiGray1}"
BorderThickness="1"
ClipToBounds="True"
CornerRadius="12">
Expand Down
2 changes: 1 addition & 1 deletion demo/Ursa.Demo/Pages/DrawerDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</u:Form>
<Grid Grid.Column="1" ClipToBounds="True">
<Border
BorderBrush="{DynamicResource SemiGrey1}"
BorderBrush="{DynamicResource SemiGray1}"
Background="{DynamicResource SemiColorBackground1}"
BorderThickness="1"
ClipToBounds="True"
Expand Down
8 changes: 4 additions & 4 deletions demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<u:DualBadge Classes="Yellow">Yellow</u:DualBadge>
<u:DualBadge Classes="Amber">Amber</u:DualBadge>
<u:DualBadge Classes="Orange">Orange</u:DualBadge>
<u:DualBadge Classes="Grey">Grey</u:DualBadge>
<u:DualBadge Classes="Gray">Gray</u:DualBadge>
</WrapPanel>
<WrapPanel>
<u:DualBadge Classes="FlatSquare Red">Red</u:DualBadge>
Expand All @@ -83,7 +83,7 @@
<u:DualBadge Classes="FlatSquare Yellow">Yellow</u:DualBadge>
<u:DualBadge Classes="FlatSquare Amber">Amber</u:DualBadge>
<u:DualBadge Classes="FlatSquare Orange">Orange</u:DualBadge>
<u:DualBadge Classes="FlatSquare Grey">Grey</u:DualBadge>
<u:DualBadge Classes="FlatSquare Gray">Gray</u:DualBadge>
</WrapPanel>
<WrapPanel>
<u:DualBadge Classes="Plastic Red">Red</u:DualBadge>
Expand All @@ -101,7 +101,7 @@
<u:DualBadge Classes="Plastic Yellow">Yellow</u:DualBadge>
<u:DualBadge Classes="Plastic Amber">Amber</u:DualBadge>
<u:DualBadge Classes="Plastic Orange">Orange</u:DualBadge>
<u:DualBadge Classes="Plastic Grey">Grey</u:DualBadge>
<u:DualBadge Classes="Plastic Gray">Gray</u:DualBadge>
</WrapPanel>
<WrapPanel>
<u:DualBadge Classes="ForTheBadge Red">Red</u:DualBadge>
Expand All @@ -119,7 +119,7 @@
<u:DualBadge Classes="ForTheBadge Yellow">Yellow</u:DualBadge>
<u:DualBadge Classes="ForTheBadge Amber">Amber</u:DualBadge>
<u:DualBadge Classes="ForTheBadge Orange">Orange</u:DualBadge>
<u:DualBadge Classes="ForTheBadge Grey">Grey</u:DualBadge>
<u:DualBadge Classes="ForTheBadge Gray">Gray</u:DualBadge>
</WrapPanel>
</StackPanel>
</ScrollViewer>
Expand Down
6 changes: 3 additions & 3 deletions demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<Border Background="{DynamicResource SemiYellow5Color}" />
<Border Background="{DynamicResource SemiAmber5Color}" />
<Border Background="{DynamicResource SemiOrange5Color}" />
<Border Background="{DynamicResource SemiGrey5Color}" />
<Border Background="{DynamicResource SemiGray5Color}" />
</u:ElasticWrapPanel>
</TabItem>
<TabItem Header="Grid Auto">
Expand All @@ -150,7 +150,7 @@
<Border Background="{DynamicResource SemiYellow5Color}" />
<Border Background="{DynamicResource SemiAmber5Color}" />
<Border Background="{DynamicResource SemiOrange5Color}" />
<Border Background="{DynamicResource SemiGrey5Color}" />
<Border Background="{DynamicResource SemiGray5Color}" />
</u:ElasticWrapPanel>
<Border Grid.Row="1" Margin="0,4" Theme="{StaticResource CardBorder}">
<TextBlock Text="This is blank" />
Expand Down Expand Up @@ -181,7 +181,7 @@
<Border Background="{DynamicResource SemiYellow5Color}" />
<Border Background="{DynamicResource SemiAmber5Color}" />
<Border Background="{DynamicResource SemiOrange5Color}" />
<Border Background="{DynamicResource SemiGrey5Color}" />
<Border Background="{DynamicResource SemiGray5Color}" />
</u:ElasticWrapPanel>
</ScrollViewer>
</Border>
Expand Down
2 changes: 1 addition & 1 deletion demo/Ursa.Demo/Pages/IntroductionDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
Width="600"
Height="300"
Scale="0.2"
Background="{DynamicResource SemiGrey1Color}"
Background="{DynamicResource SemiGray1Color}"
Source="../Assets/IRIHI.png">
<u:ImageViewer.Overlayer>
<Grid
Expand Down
6 changes: 3 additions & 3 deletions demo/Ursa.Demo/Pages/NavMenuDemo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
ActiveForeground="{DynamicResource SemiBlue5}"
ActiveStrokeBrush="{DynamicResource SemiBlue5}"
Data="{Binding Converter={StaticResource IconConverter}}"
Foreground="{DynamicResource SemiGrey5}"
Foreground="{DynamicResource SemiGray5}"
IsActive="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=u:NavMenuItem}, Path=IsHighlighted, Mode=TwoWay}"
StrokeBrush="{DynamicResource SemiGrey5}" />
StrokeBrush="{DynamicResource SemiGray5}" />
</DataTemplate>
</u:NavMenu.IconTemplate>
<u:NavMenu.Header>
Expand All @@ -68,7 +68,7 @@
Margin="4 12"
Background="Transparent"
DockPanel.Dock="Left">
<iri:IrihiLogo Width="32" Fill="{DynamicResource SemiGrey7}" />
<iri:IrihiLogo Width="32" Fill="{DynamicResource SemiGray7}" />
</Panel>
<TextBlock
Grid.Column="1"
Expand Down
6 changes: 3 additions & 3 deletions demo/Ursa.Demo/Views/MainView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
ActiveForeground="{DynamicResource SemiBlue5}"
ActiveStrokeBrush="{DynamicResource SemiBlue5}"
Data="{Binding Converter={StaticResource IconConverter}}"
Foreground="{DynamicResource SemiGrey5}"
Foreground="{DynamicResource SemiGray5}"
IsActive="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=u:NavMenuItem}, Path=IsHighlighted, Mode=TwoWay}"
StrokeBrush="{DynamicResource SemiGrey5}" />
StrokeBrush="{DynamicResource SemiGray5}" />
</DataTemplate>
</u:NavMenu.IconTemplate>
<u:NavMenu.HeaderTemplate>
Expand All @@ -77,7 +77,7 @@
u:NavMenu.CanToggle="True"
Background="Transparent"
DockPanel.Dock="Left">
<iri:IrihiLogo Width="32" Fill="{DynamicResource SemiGrey7}" />
<iri:IrihiLogo Width="32" Fill="{DynamicResource SemiGray7}" />
</Panel>
<TextBlock
VerticalAlignment="Center"
Expand Down
6 changes: 3 additions & 3 deletions src/Ursa.Themes.Semi/Controls/Avatar.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type u:Avatar}" TargetType="{x:Type u:Avatar}">
<Setter Property="Foreground" Value="{DynamicResource AvatarForeground}" />
<Setter Property="Background" Value="{DynamicResource AvatarGreyBackground}" />
<Setter Property="Background" Value="{DynamicResource AvatarGrayBackground}" />
<Setter Property="FontSize" Value="{DynamicResource AvatarMediumFontSize}" />
<Setter Property="FontWeight" Value="{DynamicResource AvatarFontWeight}" />
<Setter Property="Padding" Value="3" />
Expand Down Expand Up @@ -105,8 +105,8 @@
<Style Selector="^.Orange">
<Setter Property="Background" Value="{DynamicResource AvatarOrangeBackground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource AvatarGreyBackground}" />
<Style Selector="^.Gray">
<Setter Property="Background" Value="{DynamicResource AvatarGrayBackground}" />
</Style>

<Style Selector="^.Square">
Expand Down
8 changes: 4 additions & 4 deletions src/Ursa.Themes.Semi/Controls/DualBadge.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
<Style Selector="^.Orange">
<Setter Property="Background" Value="{DynamicResource DualBadgeFlatOrangeBackground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreyBackground}" />
<Style Selector="^.Gray">
<Setter Property="Background" Value="{DynamicResource DualBadgeFlatGrayBackground}" />
</Style>

<Style Selector="^.FlatSquare">
Expand Down Expand Up @@ -176,8 +176,8 @@
<Style Selector="^.Orange">
<Setter Property="Background" Value="{DynamicResource DualBadgePlasticOrangeBackground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource DualBadgePlasticGreyBackground}" />
<Style Selector="^.Gray">
<Setter Property="Background" Value="{DynamicResource DualBadgePlasticGrayBackground}" />
</Style>
</Style>

Expand Down
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Controls/Timeline.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<Setter Property="IsVisible" Value="True" />
</Style>
<Style Selector="^:empty-icon[Type=Default] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiGrey6}" />
<Setter Property="Fill" Value="{DynamicResource SemiGray6}" />
</Style>
<Style Selector="^:empty-icon[Type=Error] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiRed6}" />
Expand Down
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
<StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
<StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
<StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
<StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
<StaticResource x:Key="AvatarGrayBackground" ResourceKey="SemiGray3" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
<StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
<StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGrey4" />
<StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGray4" />
<StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorWhite" />
<StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
</ResourceDictionary>
20 changes: 10 additions & 10 deletions src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
<StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
<LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey3Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey2Color}" Offset="1" />
<GradientStop Color="{StaticResource SemiGray3Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray2Color}" Offset="1" />
</LinearGradientBrush>

<LinearGradientBrush x:Key="DualBadgeFlatRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
Expand Down Expand Up @@ -67,15 +67,15 @@
<GradientStop Color="{StaticResource SemiOrange5Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiOrange4Color}" Offset="1" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="DualBadgeFlatGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey5Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey4Color}" Offset="1" />
<LinearGradientBrush x:Key="DualBadgeFlatGrayBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGray5Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray4Color}" Offset="1" />
</LinearGradientBrush>


<LinearGradientBrush x:Key="DualBadgePlasticHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey2Color}" Offset="1" />
<GradientStop Color="{StaticResource SemiGray4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray2Color}" Offset="1" />
</LinearGradientBrush>

<LinearGradientBrush x:Key="DualBadgePlasticRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
Expand Down Expand Up @@ -138,8 +138,8 @@
<GradientStop Color="{StaticResource SemiOrange6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiOrange4Color}" Offset="1" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="DualBadgePlasticGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey4Color}" Offset="1" />
<LinearGradientBrush x:Key="DualBadgePlasticGrayBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGray6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray4Color}" Offset="1" />
</LinearGradientBrush>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGray2Color}" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
<StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
<StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
<StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
<StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
<StaticResource x:Key="AvatarGrayBackground" ResourceKey="SemiGray3" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Light/Clock.axaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
<StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
<StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGrey4" />
<StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGray4" />
<StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorWhite" />
<StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
</ResourceDictionary>
20 changes: 10 additions & 10 deletions src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
<StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
<LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey7Color}" Offset="1" />
<GradientStop Color="{StaticResource SemiGray6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray7Color}" Offset="1" />
</LinearGradientBrush>

<LinearGradientBrush x:Key="DualBadgeFlatRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
Expand Down Expand Up @@ -67,15 +67,15 @@
<GradientStop Color="{StaticResource SemiOrange4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiOrange5Color}" Offset="1" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="DualBadgeFlatGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey5Color}" Offset="1" />
<LinearGradientBrush x:Key="DualBadgeFlatGrayBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGray4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray5Color}" Offset="1" />
</LinearGradientBrush>


<LinearGradientBrush x:Key="DualBadgePlasticHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey8Color}" Offset="1" />
<GradientStop Color="{StaticResource SemiGray6Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray8Color}" Offset="1" />
</LinearGradientBrush>

<LinearGradientBrush x:Key="DualBadgePlasticRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
Expand Down Expand Up @@ -138,8 +138,8 @@
<GradientStop Color="{StaticResource SemiOrange4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiOrange6Color}" Offset="1" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="DualBadgePlasticGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGrey6Color}" Offset="1" />
<LinearGradientBrush x:Key="DualBadgePlasticGrayBackground" StartPoint="0%,0%" EndPoint="0%,100%">
<GradientStop Color="{StaticResource SemiGray4Color}" Offset="0" />
<GradientStop Color="{StaticResource SemiGray6Color}" Offset="1" />
</LinearGradientBrush>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGray2Color}" />
</ResourceDictionary>
Loading