diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml index 66027569..12b81534 100644 --- a/v2rayN/v2rayN/App.xaml +++ b/v2rayN/v2rayN/App.xaml @@ -17,6 +17,9 @@ 26 + 12 + 14 + 16 - + - @@ -99,7 +99,7 @@ x:Key="ToolbarMenu" BasedOn="{StaticResource MaterialDesignMenu}" TargetType="{x:Type Menu}"> - + @@ -107,15 +107,35 @@ x:Key="DefComboBox" BasedOn="{StaticResource MaterialDesignComboBox}" TargetType="{x:Type ComboBox}"> - + + + + + + diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml index f1a4fff3..8f0de688 100644 --- a/v2rayN/v2rayN/Views/AddServer2Window.xaml +++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml @@ -73,7 +73,7 @@ Margin="4" VerticalAlignment="Top" AcceptsReturn="True" - Style="{StaticResource MaterialDesignOutlinedTextBox}" /> + Style="{StaticResource MyOutlinedTextBox}" /> + Style="{StaticResource MyOutlinedTextBox}" /> @@ -157,7 +158,7 @@ Margin="4" HorizontalAlignment="Left" AcceptsReturn="True" - Style="{StaticResource MaterialDesignOutlinedTextBox}" /> + Style="{StaticResource MyOutlinedTextBox}" /> + Margin="{StaticResource ServerItemMargin}" + Style="{StaticResource DefTextBox}" /> + Margin="{StaticResource ServerItemMargin}" + Style="{StaticResource DefTextBox}" /> + HorizontalAlignment="Left" + Style="{StaticResource DefTextBox}" /> + Margin="{StaticResource ServerItemMargin}" + Style="{StaticResource DefTextBox}" />