styliing

kikipoulet · Aug 14, 2024 · 9affee2 · 9affee2
1 parent a3fc29e
commit 9affee2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/SukiUI/ColorTheme/Light.axaml b/SukiUI/ColorTheme/Light.axaml
@@ -38,7 +38,7 @@
     <system:Double x:Key="GlassOpacity">0.42</system:Double>
 
     <system:Double x:Key="ControlGlassOpacity">0.05</system:Double>
-    <system:Double x:Key="DiscreteControlGlassOpacity">0.31</system:Double>
+    <system:Double x:Key="DiscreteControlGlassOpacity">0.4</system:Double>
     <Color x:Key="ControlSukiGlassCardBackground">#fd111111</Color>
 
 </ResourceDictionary>
diff --git a/SukiUI/Controls/GlassMorphism/GlassCard.axaml b/SukiUI/Controls/GlassMorphism/GlassCard.axaml
@@ -62,7 +62,7 @@
         </Style>
 
         <Style Selector="^.Discrete">
-
+            <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
             <Setter Property="Padding" Value="0"></Setter>
         </Style>
         <Style Selector="^.Control /template/ Border#PART_BorderCard">

diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
@@ -102,7 +102,7 @@
                 <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
             </Style>
             <Style Selector="^ /template/ Border">
-                <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
+              <!--  <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" /> -->
                 <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryColor}" />
                 <Setter Property="RenderTransform">
                     <Setter.Value>

diff --git a/SukiUI/Theme/DatePicker.axaml b/SukiUI/Theme/DatePicker.axaml
@@ -56,7 +56,7 @@
                                 CornerRadius="0" Padding="0"
                                 IsEnabled="{TemplateBinding IsEnabled}"
                                 TemplatedControl.IsTemplateFocusTarget="True">
-                            <suki:GlassCard CornerRadius="{DynamicResource SmallCornerRadius}" Height="{TemplateBinding Height}" BorderBrush="{TemplateBinding BorderBrush}"
+                            <suki:GlassCard CornerRadius="{DynamicResource SmallCornerRadius}" Height="{TemplateBinding Height}" 
                                             BorderThickness="{TemplateBinding BorderThickness}" Classes="Discrete" >
                             <Grid Margin="14,0"  ColumnDefinitions="Auto,Auto">
                                 <Grid Name="PART_ButtonContentGrid"

diff --git a/SukiUI/Theme/NumericUpDownStyles.xaml b/SukiUI/Theme/NumericUpDownStyles.xaml
@@ -19,7 +19,7 @@
         <Setter Property="Padding" Value="4" />
         <Setter Property="Template">
             <ControlTemplate>
-                <suki:GlassCard VerticalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Padding="0">
+                <suki:GlassCard Classes="Discrete" VerticalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Padding="0">
                 <ButtonSpinner Name="PART_Spinner" 
                                Margin="5,4" 
                                Height="26"