update theme

sandre58 · Sep 15, 2024 · 78e9963 · 78e9963
1 parent 812f1be
commit 78e9963
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/MyNet.Wpf.Presentation/Views/Rules/EditableRulesView.xaml b/src/MyNet.Wpf.Presentation/Views/Rules/EditableRulesView.xaml
@@ -43,7 +43,7 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <my:Card Style="{StaticResource MyNet.Styles.Card.Elevation.Application}" Padding="{StaticResource MyNet.Margins.Default}">
+                    <my:Card Style="{StaticResource MyNet.Styles.Card.Elevation.Application}" Padding="{StaticResource MyNet.Margins.Default}" my:ElevationAssist.Elevation="Dp0">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />

diff --git a/src/MyNet.Wpf/Styles/Controls.ToolTip.xaml b/src/MyNet.Wpf/Styles/Controls.ToolTip.xaml
@@ -27,9 +27,9 @@
                     <ctrl:Card x:Name="card"
                                Style="{StaticResource MyNet.Styles.Card.Popup}"
                                Padding="{TemplateBinding Padding}"
-                               Background="{TemplateBinding Background}"
                                p:PopupAssist.PlacementMode="{Binding Path=(p:PopupAssist.PlacementMode), RelativeSource={RelativeSource TemplatedParent}}"
                                p:PopupAssist.ShowIndicator="True"
+                               Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
                                BorderThickness="{TemplateBinding BorderThickness}"
                                Foreground="{TemplateBinding Foreground}">
@@ -39,7 +39,7 @@
                                             TextElement.FontSize="{Binding Path=(p:HeaderAssist.FontSize), RelativeSource={RelativeSource TemplatedParent}}"
                                             TextElement.FontWeight="{Binding Path=(p:HeaderAssist.FontWeight), RelativeSource={RelativeSource TemplatedParent}}"
                                             Visibility="{Binding Path=(p:HeaderAssist.Header), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static c:NullToVisibilityConverter.CollapsedIfNull}}" />
-                            <ContentPresenter>
+                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}">
                                 <ContentPresenter.Resources>
                                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MyNet.Styles.TextBlock}">
                                         <Setter Property="TextAlignment" Value="Justify" />

diff --git a/src/MyNet.Wpf/Styles/Themes/Theme.Dark.xaml b/src/MyNet.Wpf/Styles/Themes/Theme.Dark.xaml
@@ -26,7 +26,7 @@
     <Color x:Key="MyNet.Colors.Dialog.Background">#292929</Color>
 
     <!-- Popup -->
-    <Color x:Key="MyNet.Colors.Popup.Background">#262626</Color>
+    <Color x:Key="MyNet.Colors.Popup.Background">#242424</Color>
 
     <!-- ScrollBar -->
     <Color x:Key="MyNet.Colors.ScrollBar.Background">#858585</Color>