Skip to content

Commit

Permalink
Improved Style for Desktop version
Browse files Browse the repository at this point in the history
  • Loading branch information
@2dust
2dust committed Sep 16, 2024
1 parent 885f193 commit aa829a6
Show file tree
Hide file tree
Showing 12 changed files with 502 additions and 514 deletions.
16 changes: 0 additions & 16 deletions v2rayN/v2rayN.Desktop/Styles/GlobalStyles.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,6 @@
</Border>
</Design.PreviewWith>

<Style Selector="TextBlock.Margin4">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="StackPanel.Margin4">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="DockPanel.Margin4">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="WrapPanel.Margin4">
<Setter Property="Margin" Value="8" />
</Style>
<Style Selector="Grid.Margin4">
<Setter Property="Margin" Value="8" />
</Style>

<Style Selector="TextBlock.Margin8">
<Setter Property="Margin" Value="8" />
</Style>
Expand Down
28 changes: 14 additions & 14 deletions v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<DockPanel Classes="Margin8">
<StackPanel
HorizontalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
Expand Down Expand Up @@ -57,14 +57,14 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.menuServers}" />

<TextBlock
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbRemarks}" />

<TextBox
Expand All @@ -74,13 +74,13 @@
Width="400"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin4" />
Classes="Margin8" />

<TextBlock
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbAddress}" />
<TextBox
x:Name="txtAddress"
Expand All @@ -89,7 +89,7 @@
Width="400"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
IsReadOnly="True" />
<StackPanel
Grid.Row="2"
Expand All @@ -110,32 +110,32 @@
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbCoreType}" />
<ComboBox
x:Name="cmbCoreType"
Grid.Row="3"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin4"
Classes="Margin8"
MaxDropDownHeight="1000" />

<TextBlock
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbDisplayLog}" />
<StackPanel
Grid.Row="4"
Grid.Column="1"
Classes="Margin4"
Classes="Margin8"
Orientation="Horizontal">
<ToggleSwitch
x:Name="togDisplayLog"
HorizontalAlignment="Left"
Classes="Margin4" />
Classes="Margin8" />
<TextBlock
Margin="8,0"
VerticalAlignment="Center"
Expand All @@ -146,20 +146,20 @@
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
Text="{x:Static resx:ResUI.TbPreSocksPort}" />
<TextBox
x:Name="txtPreSocksPort"
Grid.Row="5"
Grid.Column="1"
Width="200"
HorizontalAlignment="Left"
Classes="Margin4" />
Classes="Margin8" />
<StackPanel
Grid.Row="6"
Grid.Column="1"
Grid.ColumnSpan="2"
Classes="Margin4">
Classes="Margin8">
<TextBlock
Width="500"
VerticalAlignment="Center"
Expand Down
Loading

0 comments on commit aa829a6

Please sign in to comment.