Skip to content

Standardize spelling: Grey to Gray #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SignorParabellaux wants to merge 1 commit into
base: nightly
Choose a base branch
from
Open

Standardize spelling: Grey to Gray #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
</StackPanel>
</Flyout>
Expand Down
8 changes: 4 additions & 4 deletions demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
RowDefinitions="*, Auto, *">
<Border
HorizontalAlignment="Stretch"
Background="{DynamicResource SemiGrey0Color}"
Background="{DynamicResource SemiGray0Color}"
CornerRadius="10" />
<GridSplitter Grid.Row="1" ShowsPreview="True" />
<Border
Grid.Row="2"
HorizontalAlignment="Stretch"
Background="{DynamicResource SemiGrey0Color}"
Background="{DynamicResource SemiGray0Color}"
CornerRadius="10" />
</Grid>
<Grid
Expand All @@ -29,13 +29,13 @@
ColumnDefinitions="*, Auto, *">
<Border
HorizontalAlignment="Stretch"
Background="{DynamicResource SemiGrey0Color}"
Background="{DynamicResource SemiGray0Color}"
CornerRadius="10" />
<GridSplitter Grid.Column="1" ShowsPreview="True" />
<Border
Grid.Column="2"
HorizontalAlignment="Stretch"
Background="{DynamicResource SemiGrey0Color}"
Background="{DynamicResource SemiGray0Color}"
CornerRadius="10" />
</Grid>
</StackPanel>
Expand Down
6 changes: 3 additions & 3 deletions demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>
<WrapPanel>
Expand All @@ -197,7 +197,7 @@
<Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Ghost Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>
<WrapPanel>
Expand All @@ -216,7 +216,7 @@
<Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Solid Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion demo/Semi.Avalonia.Demo/Pages/Overview.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
<Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
<Label Classes="Large" Theme="{StaticResource TagLabel}">Large</Label>
<Label Classes="Circle" Theme="{StaticResource TagLabel}">Circle</Label>
Expand Down
4 changes: 2 additions & 2 deletions demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<TabControl Grid.Column="0">
<TabItem Header="Default">
<Border
BorderBrush="{DynamicResource SemiGrey1}"
BorderBrush="{DynamicResource SemiGray1}"
BorderThickness="1">
<SplitView
Name="SplitView"
Expand Down Expand Up @@ -181,7 +181,7 @@
</TabItem>
<TabItem Header="VerticalSplitView">
<Border
BorderBrush="{DynamicResource SemiGrey1}"
BorderBrush="{DynamicResource SemiGray1}"
BorderThickness="1">
<SplitView
Name="SplitView2"
Expand Down
2 changes: 1 addition & 1 deletion demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public partial class PaletteDemoViewModel : ObservableObject
"Red", "Pink", "Purple", "Violet", "Indigo",
"Blue", "LightBlue", "Cyan", "Teal", "Green",
"LightGreen", "Lime", "Yellow", "Amber", "Orange",
"Grey"
"Gray"
];

private readonly IResourceDictionary? _lightResourceDictionary;
Expand Down
2 changes: 1 addition & 1 deletion src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public class SemiColorDarkPalette: IColorPalette
Color.FromUInt32(0xFFFFF9ED),
},
{
//Grey
//Gray
Color.FromUInt32(0xFF1C1F23),
Color.FromUInt32(0xFF2E3238),
Color.FromUInt32(0xFF41464C),
Expand Down
2 changes: 1 addition & 1 deletion src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public class SemiColorLightPalette: IColorPalette
Color.FromUInt32(0xFF541D00),
},
{
//Grey
//Gray
Color.FromUInt32(0xFFF9F9F9),
Color.FromUInt32(0xFFE6E8EA),
Color.FromUInt32(0xFFC6CACD),
Expand Down
34 changes: 17 additions & 17 deletions src/Semi.Avalonia/Controls/Label.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<Label Classes="Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>
<WrapPanel>
Expand All @@ -53,7 +53,7 @@
<Label Classes="Ghost Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Ghost Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Ghost Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Ghost Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Ghost Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="Ghost White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>
<WrapPanel>
Expand All @@ -72,7 +72,7 @@
<Label Classes="Solid Yellow" Theme="{StaticResource TagLabel}">Yellow</Label>
<Label Classes="Solid Amber" Theme="{StaticResource TagLabel}">Amber</Label>
<Label Classes="Solid Orange" Theme="{StaticResource TagLabel}">Orange</Label>
<Label Classes="Solid Grey" Theme="{StaticResource TagLabel}">Grey</Label>
<Label Classes="Solid Gray" Theme="{StaticResource TagLabel}">Gray</Label>
<Label Classes="Solid White" Theme="{StaticResource TagLabel}">White</Label>
</WrapPanel>

Expand Down Expand Up @@ -161,7 +161,7 @@
<!-- Light, Ghost, Solid. -->
<!-- Shape: Square,Circle. Default is Square -->
<!-- Size: Small, Large. Default is Small -->
<!-- Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Grey, White. Default is Grey -->
<!-- Color: Red, Pink, Purple, Violet, Indigo, Blue, LightBlue, Cyan, Teal, Green, LightGreen, Lime, Yellow, Amber, Orange, Gray, White. Default is Gray -->
<ControlTheme x:Key="TagLabel" TargetType="Label">
<Setter Property="BorderThickness" Value="{DynamicResource LabelTagBorderThickness}" />
<Setter Property="MinHeight" Value="{DynamicResource LabelTagSmallHeight}" />
Expand Down Expand Up @@ -200,8 +200,8 @@
</Style>
<Style Selector="^">
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
<Setter Property="Background" Value="{DynamicResource LabelTagLightGrayBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGrayForeground}" />
<Style Selector="^.Red">
<Setter Property="Background" Value="{DynamicResource LabelTagLightRedBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightRedForeground}" />
Expand Down Expand Up @@ -262,15 +262,15 @@
<Setter Property="Background" Value="{DynamicResource LabelTagLightOrangeBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightOrangeForeground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
<Style Selector="^.Gray">
<Setter Property="Background" Value="{DynamicResource LabelTagLightGrayBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGrayForeground}" />
</Style>
</Style>
<Style Selector="^.Ghost">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightGreyBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightGrayBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGrayForeground}" />
<Style Selector="^.Red">
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostRedBorderBrush}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostRedForeground}" />
Expand Down Expand Up @@ -331,15 +331,15 @@
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostOrangeBorderBrush}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostOrangeForeground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
<Style Selector="^.Gray">
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGrayBorderBrush}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGrayForeground}" />
</Style>
</Style>
<Style Selector="^.Solid">
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagSolidForeground}" />
<Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
<Setter Property="Background" Value="{DynamicResource LabelTagSolidGrayBackground}" />
<Style Selector="^.Red">
<Setter Property="Background" Value="{DynamicResource LabelTagSolidRedBackground}" />
</Style>
Expand Down Expand Up @@ -385,8 +385,8 @@
<Style Selector="^.Orange">
<Setter Property="Background" Value="{DynamicResource LabelTagSolidOrangeBackground}" />
</Style>
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
<Style Selector="^.Gray">
<Setter Property="Background" Value="{DynamicResource LabelTagSolidGrayBackground}" />
</Style>
</Style>

Expand Down
12 changes: 6 additions & 6 deletions src/Semi.Avalonia/Themes/Dark/Label.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="{StaticResource SemiAmber5Color}" />
<StaticResource x:Key="LabelTagLightOrangeForeground" ResourceKey="SemiOrange8" />
<SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="{StaticResource SemiOrange5Color}" />
<StaticResource x:Key="LabelTagLightGreyForeground" ResourceKey="SemiGrey8" />
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
<StaticResource x:Key="LabelTagLightGrayForeground" ResourceKey="SemiGray8" />
<SolidColorBrush x:Key="LabelTagLightGrayBackground" Opacity="0.15" Color="{StaticResource SemiGray5Color}" />

<StaticResource x:Key="LabelTagGhostRedBorderBrush" ResourceKey="SemiRed4" />
<StaticResource x:Key="LabelTagGhostRedForeground" ResourceKey="SemiRed5" />
Expand Down Expand Up @@ -63,8 +63,8 @@
<StaticResource x:Key="LabelTagGhostAmberForeground" ResourceKey="SemiAmber5" />
<StaticResource x:Key="LabelTagGhostOrangeBorderBrush" ResourceKey="SemiOrange4" />
<StaticResource x:Key="LabelTagGhostOrangeForeground" ResourceKey="SemiOrange5" />
<StaticResource x:Key="LabelTagGhostGreyBorderBrush" ResourceKey="SemiGrey4" />
<StaticResource x:Key="LabelTagGhostGreyForeground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagGhostGrayBorderBrush" ResourceKey="SemiGray4" />
<StaticResource x:Key="LabelTagGhostGrayForeground" ResourceKey="SemiGray5" />

<StaticResource x:Key="LabelTagSolidForeground" ResourceKey="SemiWhite" />
<StaticResource x:Key="LabelTagSolidRedBackground" ResourceKey="SemiRed5" />
Expand All @@ -82,11 +82,11 @@
<StaticResource x:Key="LabelTagSolidYellowBackground" ResourceKey="SemiYellow5" />
<StaticResource x:Key="LabelTagSolidAmberBackground" ResourceKey="SemiAmber5" />
<StaticResource x:Key="LabelTagSolidOrangeBackground" ResourceKey="SemiOrange5" />
<StaticResource x:Key="LabelTagSolidGreyBackground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagSolidGrayBackground" ResourceKey="SemiGray5" />

<StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGray2Color}" />

<!-- Obsolete -->
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
Expand Down
12 changes: 6 additions & 6 deletions src/Semi.Avalonia/Themes/Light/Label.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<SolidColorBrush x:Key="LabelTagLightAmberBackground" Opacity="0.15" Color="{StaticResource SemiAmber5Color}" />
<StaticResource x:Key="LabelTagLightOrangeForeground" ResourceKey="SemiOrange8" />
<SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="{StaticResource SemiOrange5Color}" />
<StaticResource x:Key="LabelTagLightGreyForeground" ResourceKey="SemiGrey8" />
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
<StaticResource x:Key="LabelTagLightGrayForeground" ResourceKey="SemiGray8" />
<SolidColorBrush x:Key="LabelTagLightGrayBackground" Opacity="0.15" Color="{StaticResource SemiGray5Color}" />

<StaticResource x:Key="LabelTagGhostRedBorderBrush" ResourceKey="SemiRed4" />
<StaticResource x:Key="LabelTagGhostRedForeground" ResourceKey="SemiRed5" />
Expand Down Expand Up @@ -63,8 +63,8 @@
<StaticResource x:Key="LabelTagGhostAmberForeground" ResourceKey="SemiAmber5" />
<StaticResource x:Key="LabelTagGhostOrangeBorderBrush" ResourceKey="SemiOrange4" />
<StaticResource x:Key="LabelTagGhostOrangeForeground" ResourceKey="SemiOrange5" />
<StaticResource x:Key="LabelTagGhostGreyBorderBrush" ResourceKey="SemiGrey4" />
<StaticResource x:Key="LabelTagGhostGreyForeground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagGhostGrayBorderBrush" ResourceKey="SemiGray4" />
<StaticResource x:Key="LabelTagGhostGrayForeground" ResourceKey="SemiGray5" />

<StaticResource x:Key="LabelTagSolidForeground" ResourceKey="SemiWhite" />
<StaticResource x:Key="LabelTagSolidRedBackground" ResourceKey="SemiRed5" />
Expand All @@ -82,11 +82,11 @@
<StaticResource x:Key="LabelTagSolidYellowBackground" ResourceKey="SemiYellow5" />
<StaticResource x:Key="LabelTagSolidAmberBackground" ResourceKey="SemiAmber5" />
<StaticResource x:Key="LabelTagSolidOrangeBackground" ResourceKey="SemiOrange5" />
<StaticResource x:Key="LabelTagSolidGreyBackground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagSolidGrayBackground" ResourceKey="SemiGray5" />

<StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGray2Color}" />

<!-- Obsolete -->
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
Expand Down
Loading