Adjust the margins and paddings

5amN1 · Feb 17, 2023 · 4409a89 · 4409a89
1 parent 988896b
commit 4409a89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/clashN/clashN/App.xaml b/clashN/clashN/App.xaml
@@ -11,7 +11,7 @@
         <ResourceDictionary xmlns:system="clr-namespace:System;assembly=mscorlib">
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme
-                    BaseTheme="Light"
+                    BaseTheme="Dark"
                     PrimaryColor="Blue"
                     SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
@@ -65,8 +65,9 @@
             <Style TargetType="{x:Type TextElement}">
                 <Setter Property="FontWeight" Value="Regular" />
             </Style>
-            <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
-                <Setter Property="Margin" Value="2" />
+            <Style x:Key="lvItemSelected"
+                   TargetType="{x:Type ListViewItem}">
+                <Setter Property="Margin" Value="5" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="ListViewItem">
@@ -75,7 +76,7 @@
                             </materialDesign:Card>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsSelected" Value="true">
-                                    <Setter TargetName="_Card" Property="Foreground" Value="{DynamicResource PrimaryHueLightBrush}"/>
+                                    <Setter TargetName="_Card" Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}"/>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -96,6 +97,7 @@
                 BasedOn="{StaticResource MaterialDesignRaisedButton}"
                 TargetType="{x:Type ButtonBase}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" />
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
             </Style>
             <Style
                 x:Key="DefMenu"

diff --git a/clashN/clashN/Views/MainWindow.xaml b/clashN/clashN/Views/MainWindow.xaml
@@ -32,7 +32,7 @@
         Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
         <Grid>
             <Grid Grid.Column="0">
-                <TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
+                <TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" Padding="10, 0">
                     <materialDesign:NavigationRailAssist.FloatingContent>
                         <StackPanel
                             Width="auto"

diff --git a/clashN/clashN/Views/ProxiesView.xaml b/clashN/clashN/Views/ProxiesView.xaml
@@ -96,11 +96,12 @@
             </ToolBar>
         </ToolBarTray>
         <DockPanel>
-
             <ListView
                 x:Name="lstProxyGroups"
+                Margin="0, 0, 5, 0"
                 BorderThickness="0"
                 DockPanel.Dock="Left"
+                Style="{StaticResource MaterialDesignListView}"
                 ItemContainerStyle="{StaticResource lvItemSelected}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollBarVisibility="Visible">
@@ -145,6 +146,7 @@
             <ListView
                 x:Name="lstProxyDetails"
                 BorderThickness="0"
+                Style="{StaticResource MaterialDesignListView}"
                 ItemContainerStyle="{StaticResource lvItemSelected}"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollBarVisibility="Visible">