Merge pull request kikipoulet#354 from sirdoombox/main

Change standard flat button style to match accent.
sn4k3 · Dec 11, 2024 · 9ce5abf · 9ce5abf
2 parents 9da3472 + 804f8f6
commit 9ce5abf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/SukiUI/Controls/BusyArea.axaml b/SukiUI/Controls/BusyArea.axaml
@@ -62,7 +62,7 @@
 
                             <ContentPresenter HorizontalAlignment="Center"
                                               VerticalAlignment="Center"
-                                              IsHitTestVisible="False" Content="{TemplateBinding IsBusy, Converter={x:Static converters:ProgressToContentCOnverter.Instance}}"></ContentPresenter>
+                                              IsHitTestVisible="False" Content="{TemplateBinding IsBusy, Converter={x:Static converters:ProgressToContentConverter.Instance}}"></ContentPresenter>
 
 
                         </DockPanel>

diff --git a/.../Converters/ProgressToContentCOnverter.cs → .../Converters/ProgressToContentConverter.cs b/.../Converters/ProgressToContentCOnverter.cs → .../Converters/ProgressToContentConverter.cs
@@ -7,9 +7,9 @@
 
 namespace SukiUI.Converters
 {
-    public class ProgressToContentCOnverter : IValueConverter
+    public class ProgressToContentConverter : IValueConverter
     {
-        public static readonly ProgressToContentCOnverter Instance = new ProgressToContentCOnverter();
+        public static readonly ProgressToContentConverter Instance = new ProgressToContentConverter();
 
 
         public object? Convert(object? value, Type targetType, object? parameter, 

diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
@@ -37,7 +37,7 @@
                                 </Transitions>
                             </Viewbox.Transitions>
 
-                           <ContentPresenter Content="{TemplateBinding theme:ButtonExtensions.ShowProgress, Converter={x:Static suki:ProgressToContentCOnverter.Instance}}"></ContentPresenter>
+                           <ContentPresenter Content="{TemplateBinding theme:ButtonExtensions.ShowProgress, Converter={x:Static suki:ProgressToContentConverter.Instance}}"/>
 
                         </Viewbox>
                         <ContentPresenter HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -290,7 +290,7 @@
         <Style Selector="^.Flat">
             <Setter Property="Padding" Value="20,8,20,8" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
+            <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor75}" />
             <Setter Property="Foreground" Value="White" />
             <Setter Property="Transitions">
                 <Transitions>