Skip to content

Commit d85f8ad

Browse files
committed
Theme changes
1 parent 794ccee commit d85f8ad

File tree

5 files changed

+15
-27
lines changed

5 files changed

+15
-27
lines changed

Source/vj0/Styles/FluentAvalonia/TextBoxStyles.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
<Style Selector="^ /template/ Border#PART_BorderElement">
266266
<Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}"/>
267267
<Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}"/>
268-
<Setter Property="BorderThickness" Value="1 1 1 2" />
268+
<Setter Property="BorderThickness" Value="1 1 1 1" />
269269
</Style>
270270
</Style>
271271

Source/vj0/Views/HomeView.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- Background image -->
4343
<Border x:Name="BackgroundImage" ClipToBounds="True">
4444
<Image Source="/Assets/Background/Wallpaper.png" Stretch="UniformToFill"
45-
Margin="0 0" Opacity="0.40">
45+
Opacity="0.525">
4646
<Image.OpacityMask>
4747
<LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,55%">
4848
<GradientStop Color="#FF000000" Offset="0" />

Source/vj0/Views/Profiles/ProfileCard.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
PointerEntered="OnCardPointerEntered"
2626
PointerExited="OnCardPointerExited"
2727
ClipToBounds="True"
28-
BorderBrush="#27282d"
28+
BorderBrush="#28292e"
2929
BorderThickness="1"
3030
Margin="14 6 14 28" HorizontalAlignment="Stretch" VerticalAlignment="Center">
3131

Source/vj0/Views/Profiles/ProfileSelectionView.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<!-- Background image -->
2727
<Border x:Name="BackgroundImage" ClipToBounds="True">
2828
<Image Source="/Assets/Background/Wallpaper.png" Stretch="UniformToFill"
29-
Margin="0 0" Opacity="0.165">
29+
Margin="0 0" Opacity="0.265">
3030
<Image.OpacityMask>
31-
<LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,96%">
31+
<LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,76%">
3232
<GradientStop Color="#FF000000" Offset="0" />
3333
<GradientStop Color="#00000000" Offset="1" />
3434
</LinearGradientBrush>

Source/vj0/Views/TitleBar.axaml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,24 @@
6161
<!-- Profile Button -->
6262
<Button Name="Profile" ClipToBounds="True" Opacity="{Binding ProfileButtonOpacity}" BorderThickness="0" Padding="5 0 10 0" Background="Transparent" Height="45" CornerRadius="8">
6363
<Button.Flyout>
64-
<Flyout HorizontalOffset="15">
65-
<Grid Margin="2">
64+
<Flyout>
65+
<Grid Margin="3">
6666
<StackPanel Spacing="8">
67-
<Button Margin="2" Cursor="Hand" Click="EditProfile" Foreground="#e8e8e8">
67+
<Button Cursor="Hand" Click="EditProfile" HorizontalAlignment="Stretch" Padding="10 0" Height="35" Background="Transparent" CornerRadius="8" HorizontalContentAlignment="Left" VerticalContentAlignment="Center">
6868
<ToolTip.Tip>
6969
<StackPanel Orientation="Horizontal">
7070
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">Edit Settings</TextBlock>
7171
<controls1:KeybindDisplay Keybind="Ctrl+E" />
7272
</StackPanel>
7373
</ToolTip.Tip>
7474

75-
<Button.Resources>
76-
<ResourceDictionary>
77-
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="#ffffff"/>
78-
<SolidColorBrush x:Key="ButtonForeground" Color="#e8e8e8"/>
79-
</ResourceDictionary>
80-
</Button.Resources>
81-
82-
<Grid ColumnDefinitions="Auto,*,Auto">
83-
<profiles:ProfileSplashControl Grid.Column="0" Radius="8" SplashScale="1.2" DataContext="{Binding CurrentProfile}"/>
84-
85-
<StackPanel Margin="12 0 0 0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Spacing="2">
86-
<TextBlock MaxWidth="250" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" FontWeight="DemiBold" FontSize="16" Text="{Binding ProfileDisplayName}"/>
87-
<TextBlock IsVisible="True" FontSize="12" Opacity="0.5" Text="{Binding LoadedFilesDisplayWithoutDash}"/>
88-
</StackPanel>
89-
90-
<StackPanel VerticalAlignment="Center" Grid.Column="2" Margin="35 0 10 0">
91-
<avalonia:FluentIcon Opacity="1" Icon="Settings"/>
92-
</StackPanel>
93-
</Grid>
75+
<StackPanel Orientation="Horizontal" Spacing="10">
76+
<avalonia:FluentIcon Icon="Settings" IconSize="Size32" FontSize="21" IconVariant="Regular"/>
77+
78+
<TextBlock FontWeight="Light" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center">
79+
Settings
80+
</TextBlock>
81+
</StackPanel>
9482
</Button>
9583
</StackPanel>
9684
</Grid>

0 commit comments

Comments
 (0)