toast better background

kikipoulet · May 25, 2024 · 9a06c7f · 9a06c7f
1 parent cf80f3d
commit 9a06c7f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/SukiUI/Controls/SukiToast.axaml b/SukiUI/Controls/SukiToast.axaml
@@ -9,13 +9,34 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Name="PART_ToastCard"
-                        Width="300"
+                        Width="300" 
                         Margin="30,5,30,10"
-                        Padding="0"
+                        Padding="0" BorderThickness="1" BorderBrush="{DynamicResource SukiBorderBrush}"
                         BoxShadow="{DynamicResource SukiPopupShadow}"
-                        Classes="Card"
-                        CornerRadius="2">
-                    <DockPanel Margin="0,-7" LastChildFill="True">
+                        Background="{DynamicResource SukiCardBackground}"
+                        CornerRadius="15">
+                    <Border CornerRadius="15" ClipToBounds="True">
+                    <Panel>
+
+                        <Panel Margin="0">
+                            <Panel.Background>
+                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                                    <GradientStop Color="{DynamicResource SukiPrimaryColor7}" Offset="1"></GradientStop>
+                                    <GradientStop Color="Transparent" Offset="0"></GradientStop>
+                                </LinearGradientBrush>
+                            </Panel.Background>
+                        </Panel>
+                        <Panel Margin="0">
+                            <Panel.Background>
+                                <LinearGradientBrush StartPoint="0%,50%" EndPoint="100%,50%">
+                                    <GradientStop Color="{DynamicResource SukiAccentColor7}" Offset="0"></GradientStop>
+                                    <GradientStop Color="Transparent" Offset="1"></GradientStop>
+                                </LinearGradientBrush>
+                            </Panel.Background>
+                        </Panel>
+                        <Panel Margin="20, 22">
+
+                        <DockPanel Margin="0,-7" LastChildFill="True">
                         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                             <PathIcon Width="16" Margin="-6,0,0,0"
                                       Height="16"
@@ -32,6 +53,9 @@
                                           Foreground="{DynamicResource SukiText}"
                                           TextWrapping="Wrap" />
                     </DockPanel>
+                    </Panel>
+                    </Panel>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>

diff --git a/SukiUI/Theme/BorderStyles.xaml b/SukiUI/Theme/BorderStyles.xaml
@@ -6,7 +6,7 @@
                    Orientation="Horizontal">
             <Border Width="100"
                     Height="100"
-                    Classes="Card" />
+                    Classes="GradientCard" />
         </WrapPanel>
     </Design.PreviewWith>
 

diff --git a/SukiUI/Theme/Index.axaml.cs b/SukiUI/Theme/Index.axaml.cs
@@ -206,6 +206,7 @@ private void SetColorWithOpacities(string baseName, Color baseColor)
         SetResource($"{baseName}25", baseColor.WithAlpha(0.25));
         SetResource($"{baseName}15", baseColor.WithAlpha(0.15));
         SetResource($"{baseName}10", baseColor.WithAlpha(0.10));
+        SetResource($"{baseName}7", baseColor.WithAlpha(0.07));
         SetResource($"{baseName}5", baseColor.WithAlpha(0.05));
         SetResource($"{baseName}0", baseColor.WithAlpha(0.00));
     }

diff --git a/SukiUI/Theme/NotificationCardStyle.axaml b/SukiUI/Theme/NotificationCardStyle.axaml
@@ -1,6 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:content="clr-namespace:SukiUI.Content">
+        xmlns:content="clr-namespace:SukiUI.Content"
+        xmlns:controls="clr-namespace:SukiUI.Controls">
     <Design.PreviewWith>
         <Border Padding="0" Background="{DynamicResource SukiBackground}">
             <NotificationCard Content="Testing" />
@@ -30,7 +31,9 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 ClipToBounds="True"
                                 CornerRadius="10">
-                            <DockPanel>
+                            <Panel>
+
+                                <DockPanel>
                                 <PathIcon Margin="11,11,5,5"
                                           VerticalAlignment="Top"
                                           Data="{x:Static content:Icons.CircleInformation}"
@@ -43,6 +46,7 @@
                                        DockPanel.Dock="Top" />
                                 <ContentControl Name="PART_Content" Content="{TemplateBinding Content}" />
                             </DockPanel>
+                            </Panel>
                         </Border>
                     </Border>
                 </LayoutTransformControl>