Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the visual styles a bit

Browse Source
This commit is contained in:
Timothy Baldridge 2021-12-14 14:57:26 -07:00
parent 9ffd4fd446
commit f46348f9b7
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Wabbajack.App/App.axaml
View File

@ -11,15 +11,6 @@
<FluentTheme Mode="Dark" />
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
<StyleInclude Source="avares://Wabbajack.App/Assets/Wabbajack.axaml" />
<Style Selector="Button:not(:pointerover) /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent" />
</Style>
<Style Selector="Button:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="LightGray" />
<Setter Property="CornerRadius" Value="5" />
</Style>
</Application.Styles>
</Application>

17
Wabbajack.App/Assets/Wabbajack.axaml
View File

@ -7,7 +7,24 @@
</Border>
</Design.PreviewWith>
<Style Selector="Button:not(:pointerover) /template/ ContentPresenter">
<Setter Property="Background" Value="#202020" />
</Style>
<Style Selector="Button:not(:pointerover).Transparent /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent" />
</Style>
<Style Selector="Button:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="#252525" />
<Setter Property="BorderBrush" Value="LightGray" />
<Setter Property="CornerRadius" Value="5" />
</Style>
<Style Selector="controls|TagView Border">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#121212" />

2
Wabbajack.App/Controls/LargeIconButton.axaml
View File

@ -5,7 +5,7 @@
xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Wabbajack.App.Controls.LargeIconButton">
<Button x:Name="Button" x:FieldModifier="public">
<Button x:Name="Button" x:FieldModifier="public" Classes="Transparent">
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
<i:MaterialIcon x:Name="IconControl" Width="140" Height="140" />
<TextBlock x:Name="TextBlock" HorizontalAlignment="Center" FontSize="28" FontWeight="Bold" />

1
Wabbajack.App/Screens/StandardInstallationViewModel.cs
View File

@ -212,6 +212,7 @@ public class StandardInstallationViewModel : ViewModelBase
}
catch (Exception ex)
{
_logger.LogError(ex, "During installation");
ErrorPageViewModel.Display("During installation", ex);
}
}

2
Wabbajack.App/Views/MainWindow.axaml
View File

@ -33,7 +33,7 @@
<Grid RowDefinitions="40, *">
<Grid ColumnDefinitions="40, Auto, *, 40, 40, 40, 40">
<Button Grid.Column="0" x:Name="BackButton" x:FieldModifier="public">
<Button Grid.Column="0" x:Name="BackButton" x:FieldModifier="public" Classes="Transparent">
<i:MaterialIcon Kind="ArrowBack" />
</Button>
<TextBlock Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" x:Name="TitleText"></TextBlock>