tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix accents.

pull/4012/head
Dan Walmsley 6 years ago
parent
b3040728fe
commit
fb3900aea3
4 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
  2. 14
      src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
  3. 14
      src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
  4. 16
      src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml

14
src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
View File

@ -4,13 +4,13 @@
<Style.Resources>
<!-- Accent Colours -->
<!-- TODO pull accents from system... algorithm to generate shades -->
<Color x:Key="SystemAccentColor">#FF0073CF</Color>
<Color x:Key="SystemAccentColorDark1">#FF1D85D7</Color>
<Color x:Key="SystemAccentColorDark2">#FF3B97DF</Color>
<Color x:Key="SystemAccentColorDark3">#FF58A8E8</Color>
<Color x:Key="SystemAccentColorLight1">#FF0064BE</Color>
<Color x:Key="SystemAccentColorLight2">#FF0055AD</Color>
<Color x:Key="SystemAccentColorLight3">#FF00459D</Color>
<Color x:Key="SystemAccentColor">#FF0078D7</Color>
<Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
<Color x:Key="SystemAccentColorDark2">#FF004275</Color>
<Color x:Key="SystemAccentColorDark3">#FF002642</Color>
<Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
<Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
<Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
<!-- System Control Colors -->
<Color x:Key="SystemAltHighColor">#FF000000</Color>

14
src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
View File

@ -4,13 +4,13 @@
<Style.Resources>
<!-- Accent Colours -->
<!-- TODO pull accents from system... algorithm to generate shades -->
<Color x:Key="SystemAccentColor">#FF0073CF</Color>
<Color x:Key="SystemAccentColorDark1">#FF1D85D7</Color>
<Color x:Key="SystemAccentColorDark2">#FF3B97DF</Color>
<Color x:Key="SystemAccentColorDark3">#FF58A8E8</Color>
<Color x:Key="SystemAccentColorLight1">#FF0064BE</Color>
<Color x:Key="SystemAccentColorLight2">#FF0055AD</Color>
<Color x:Key="SystemAccentColorLight3">#FF00459D</Color>
<Color x:Key="SystemAccentColor">#FF0078D7</Color>
<Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
<Color x:Key="SystemAccentColorDark2">#FF004275</Color>
<Color x:Key="SystemAccentColorDark3">#FF002642</Color>
<Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
<Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
<Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
<!-- System Control Colors -->
<Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>

14
src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
View File

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=netstandard">
<Style.Resources>
<Color x:Key="SystemAccentColor">#FF0073CF</Color>
<Color x:Key="SystemAccentColor">#FF0078D7</Color>
<Color x:Key="SystemAltHighColor">#FF000000</Color>
<Color x:Key="SystemAltLowColor">#FF000000</Color>
<Color x:Key="SystemAltMediumColor">#FF000000</Color>
@ -62,12 +62,12 @@
<Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
<x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
<!-- Override system generated accent colors -->
<Color x:Key="SystemAccentColorDark1">#FF1D85D7</Color>
<Color x:Key="SystemAccentColorDark2">#FF3B97DF</Color>
<Color x:Key="SystemAccentColorDark3">#FF58A8E8</Color>
<Color x:Key="SystemAccentColorLight1">#FF0064BE</Color>
<Color x:Key="SystemAccentColorLight2">#FF0055AD</Color>
<Color x:Key="SystemAccentColorLight3">#FF00459D</Color>
<Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
<Color x:Key="SystemAccentColorDark2">#FF004275</Color>
<Color x:Key="SystemAccentColorDark3">#FF002642</Color>
<Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
<Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
<Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
<Color x:Key="RegionColor">#FF000000</Color>
<SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />

16
src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
View File

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=netstandard">
<Style.Resources>
<Color x:Key="SystemAccentColor">#FF0073CF</Color>
<Color x:Key="SystemAccentColor">#FF0078D7</Color>
<Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
<Color x:Key="SystemAltLowColor">#FFFFFFFF</Color>
<Color x:Key="SystemAltMediumColor">#FFFFFFFF</Color>
@ -61,13 +61,13 @@
<Thickness x:Key="GridViewItemRevealBorderThemeThickness">1,1,1,1</Thickness>
<Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
<x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
<!-- Override system generated accent colors -->
<Color x:Key="SystemAccentColorLight1">#FF1D85D7</Color>
<Color x:Key="SystemAccentColorLight2">#FF3B97DF</Color>
<Color x:Key="SystemAccentColorLight3">#FF58A8E8</Color>
<Color x:Key="SystemAccentColorDark1">#FF0064BE</Color>
<Color x:Key="SystemAccentColorDark2">#FF0055AD</Color>
<Color x:Key="SystemAccentColorDark3">#FF00459D</Color>
<!-- Override system generated accent colors -->
<Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
<Color x:Key="SystemAccentColorDark2">#FF004275</Color>
<Color x:Key="SystemAccentColorDark3">#FF002642</Color>
<Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
<Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
<Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
<!--<RevealBackgroundBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" TargetTheme="Light" Color="{ThemeResource SystemRevealListMediumColor}" FallbackColor="{ StaticResource SystemListMediumColor}" />-->
<Color x:Key="RegionColor">#FFFFFFFF</Color>
<SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />

Write Preview
Loading…
Cancel
Save