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}" />
+ HorizontalAlignment="Left"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ HorizontalAlignment="Left"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource ServerItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ HorizontalAlignment="Left"
+ Style="{StaticResource DefTextBox}" />
+ Style="{StaticResource MyOutlinedTextBox}" />
+ Style="{StaticResource MyOutlinedTextBox}" />
+ Style="{StaticResource MyOutlinedTextBox}" />
+ Style="{StaticResource MyOutlinedTextBox}" />
+ Style="{StaticResource MyOutlinedTextBox}" />
+ materialDesign:TextFieldAssist.HasClearButton="True"
+ Style="{StaticResource DefTextBox}" />
@@ -374,6 +375,7 @@
Width="120"
Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
+ FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
@@ -387,6 +389,7 @@
Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks"
+ FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
@@ -495,6 +498,7 @@
Width="200"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
DisplayMemberPath="remarks"
+ FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" />
@@ -703,6 +707,7 @@
MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
DisplayMemberPath="remarks"
+ FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" />
@@ -715,6 +720,7 @@
MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
DisplayMemberPath="Text"
+ FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFilledComboBox}" />
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 220ad9af..1eca1cb7 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -20,6 +20,7 @@
Margin="8,0"
VerticalAlignment="Center"
Foreground="{DynamicResource PrimaryHueLightBrush}"
+ Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.MsgInformationTitle}" />
+ IsEditable="True"
+ Style="{StaticResource DefComboBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ materialDesign:HintAssist.Hint="Level"
+ Style="{StaticResource DefComboBox}" />
+ IsEditable="True"
+ Style="{StaticResource DefComboBox}" />
+ IsEditable="True"
+ Style="{StaticResource DefComboBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefComboBox}" />
@@ -320,6 +330,7 @@
VerticalAlignment="Stretch"
AcceptsReturn="True"
BorderThickness="1"
+ Style="{StaticResource DefTextBox}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
@@ -353,7 +364,7 @@
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="mtu" />
-
-
-
-
-
-
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefComboBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ Margin="{StaticResource SettingItemMargin}"
+ Style="{StaticResource DefTextBox}" />
+ MaxDropDownHeight="1000"
+ Style="{StaticResource DefComboBox}" />
+ materialDesign:HintAssist.Hint="Protocol"
+ Style="{StaticResource DefComboBox}" />
@@ -731,6 +750,7 @@
VerticalAlignment="Stretch"
AcceptsReturn="True"
BorderThickness="1"
+ Style="{StaticResource DefTextBox}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
@@ -799,7 +819,8 @@
Grid.Column="1"
Width="200"
Margin="{StaticResource SettingItemMargin}"
- HorizontalAlignment="Left" />
+ HorizontalAlignment="Left"
+ Style="{StaticResource DefComboBox}" />
+ HorizontalAlignment="Left"
+ Style="{StaticResource DefComboBox}" />