fix(styles): colours on primary foreground text

janssen-io · Aug 18, 2024 · 128cb13 · 128cb13
1 parent 21ce08a
commit 128cb13
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/TransactionQL.DesktopApp/Assets/Styles.axaml b/TransactionQL.DesktopApp/Assets/Styles.axaml
@@ -65,7 +65,7 @@
     <Setter Property="Padding" Value="0" />
   </Style>
   <Style Selector="Button.IconAction:pointerover /template/ ContentPresenter">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryFG.Base.Neutral}" />
+    <Setter Property="Foreground" Value="{DynamicResource FG.Elevated.Primary}" />
     <Setter Property="RenderTransform" Value="TranslateY(-2px)" />
     <Setter Property="Cursor" Value="Hand" />
   </Style>
@@ -85,7 +85,7 @@
   <Style Selector="TextBlock.h2">
     <Setter Property="FontSize" Value="20" />
     <Setter Property="FontWeight" Value="Regular" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryFG.Base.Neutral}" />
+    <Setter Property="Foreground" Value="{DynamicResource FG.Base.Primary}" />
   </Style>
 
   <Style Selector="TextBlock.subtitle">

diff --git a/TransactionQL.DesktopApp/Assets/Styles/ProgressBar.axaml b/TransactionQL.DesktopApp/Assets/Styles/ProgressBar.axaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
-    <StackPanel Orientation="Vertical" Spacing="3" Background="{DynamicResource PrimaryFG.Base.Neutral}">
+    <StackPanel Orientation="Vertical" Spacing="3" Background="{DynamicResource FG.Base.Primary}">
       <ThemeVariantScope RequestedThemeVariant="Light">
         <Border Padding="20" Background="{DynamicResource BG.Elevated.Neutral}">
           <StackPanel Orientation="Vertical" Spacing="30">

diff --git a/TransactionQL.DesktopApp/Controls/StepIndicator.axaml b/TransactionQL.DesktopApp/Controls/StepIndicator.axaml
@@ -12,7 +12,7 @@
   -->
 
   <Design.PreviewWith>
-    <StackPanel Orientation="Horizontal" Spacing="3" Background="{DynamicResource PrimaryFG.Base.Neutral}">
+    <StackPanel Orientation="Horizontal" Spacing="3" Background="{DynamicResource FG.Base.Primary}">
       <ThemeVariantScope RequestedThemeVariant="Light">
         <Border Padding="20" Background="{DynamicResource BG.Base.Neutral}">
           <controls:StepIndicator NumberOfSteps="5" CurrentStep="2" />

diff --git a/TransactionQL.DesktopApp/Controls/ThemePreviewStack.axaml b/TransactionQL.DesktopApp/Controls/ThemePreviewStack.axaml
@@ -13,6 +13,7 @@
       <Border Classes="Card Padded">
         <StackPanel Orientation="Vertical" Spacing="10">
           <TextBlock>Hello</TextBlock>
+          <TextBlock Classes="Negative">-12.34</TextBlock>
           <TextBox>John</TextBox>
           <c:Dropzone />
         </StackPanel>

diff --git a/TransactionQL.DesktopApp/Views/MainWindow.axaml.cs b/TransactionQL.DesktopApp/Views/MainWindow.axaml.cs
@@ -9,7 +9,6 @@
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using ReactiveUI;
-using TransactionQL.Application;
 using TransactionQL.DesktopApp.ViewModels;
 using Module = TransactionQL.DesktopApp.ViewModels.Module;