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

More button styling

Browse Source
This commit is contained in:
Justin Swanson 2019-12-15 01:10:04 -06:00
parent e388c018dc
commit 24f94d6bb7
2 changed files with 71 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Wabbajack/Themes/Styles.xaml
View File

@ -20,10 +20,11 @@
<!-- Colors --> <!-- Colors -->
<Color x:Key="WindowBackgroundColor">#121212</Color> <Color x:Key="WindowBackgroundColor">#121212</Color>
<Color x:Key="DarkBackgroundColor">#222222</Color> <Color x:Key="DarkBackgroundColor">#222222</Color>
<Color x:Key="DarkHoverBackgroundColor">#272727</Color>
<Color x:Key="LightBackgroundColor">#424242</Color> <Color x:Key="LightBackgroundColor">#424242</Color>
<Color x:Key="BackgroundColor">#323232</Color> <Color x:Key="BackgroundColor">#323232</Color>
<Color x:Key="DisabledBackgroundColor">#424242</Color> <Color x:Key="DisabledBackgroundColor">#424242</Color>
<Color x:Key="PressedBackgroundColor">#394140</Color> <Color x:Key="PressedBackgroundColor">#323232</Color>
<Color x:Key="LightDisabledBackgroundColor">#666666</Color> <Color x:Key="LightDisabledBackgroundColor">#666666</Color>
<Color x:Key="HeatedBorderColor">#362675</Color> <Color x:Key="HeatedBorderColor">#362675</Color>
@ -49,6 +50,7 @@
<Color x:Key="LightSecondary">#8cede5</Color> <Color x:Key="LightSecondary">#8cede5</Color>
<Color x:Key="IntenseSecondary">#00ffe7</Color> <Color x:Key="IntenseSecondary">#00ffe7</Color>
<Color x:Key="Complementary">#C7FC86</Color> <Color x:Key="Complementary">#C7FC86</Color>
<Color x:Key="DarkComplementary">#8eb55e</Color>
<Color x:Key="IntenseComplementary">#abf74d</Color> <Color x:Key="IntenseComplementary">#abf74d</Color>
<Color x:Key="Analogous1">#868CFC</Color> <Color x:Key="Analogous1">#868CFC</Color>
<Color x:Key="Analogous2">#F686FC</Color> <Color x:Key="Analogous2">#F686FC</Color>
@ -102,6 +104,7 @@
<SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource Red}" /> <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource Red}" />
<SolidColorBrush x:Key="DarkBackgroundBrush" Color="{StaticResource DarkBackgroundColor}" /> <SolidColorBrush x:Key="DarkBackgroundBrush" Color="{StaticResource DarkBackgroundColor}" />
<SolidColorBrush x:Key="DarkHoverBackgroundBrush" Color="{StaticResource DarkHoverBackgroundColor}" />
<SolidColorBrush x:Key="LightBackgroundBrush" Color="{StaticResource LightBackgroundColor}" /> <SolidColorBrush x:Key="LightBackgroundBrush" Color="{StaticResource LightBackgroundColor}" />
<SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" /> <SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}" />
<SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}" /> <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}" />
@ -122,6 +125,7 @@
<SolidColorBrush x:Key="LightSecondaryBrush" Color="{StaticResource LightSecondary}" /> <SolidColorBrush x:Key="LightSecondaryBrush" Color="{StaticResource LightSecondary}" />
<SolidColorBrush x:Key="IntenseSecondaryBrush" Color="{StaticResource IntenseSecondary}" /> <SolidColorBrush x:Key="IntenseSecondaryBrush" Color="{StaticResource IntenseSecondary}" />
<SolidColorBrush x:Key="ComplementaryBrush" Color="{StaticResource Complementary}" /> <SolidColorBrush x:Key="ComplementaryBrush" Color="{StaticResource Complementary}" />
<SolidColorBrush x:Key="DarkComplementaryBrush" Color="{StaticResource DarkComplementary}" />
<SolidColorBrush x:Key="IntenseComplementaryBrush" Color="{StaticResource IntenseComplementary}" /> <SolidColorBrush x:Key="IntenseComplementaryBrush" Color="{StaticResource IntenseComplementary}" />
<SolidColorBrush x:Key="Analogous1Brush" Color="{StaticResource Analogous1}" /> <SolidColorBrush x:Key="Analogous1Brush" Color="{StaticResource Analogous1}" />
<SolidColorBrush x:Key="Analogous2Brush" Color="{StaticResource Analogous2}" /> <SolidColorBrush x:Key="Analogous2Brush" Color="{StaticResource Analogous2}" />
@ -1453,7 +1457,7 @@
<Style x:Key="MainButtonStyle" TargetType="{x:Type Button}"> <Style x:Key="MainButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" /> <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />
<Setter Property="Background" Value="{StaticResource ButtonBackground}" /> <Setter Property="Background" Value="{StaticResource DarkBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource ButtonBorder}" /> <Setter Property="BorderBrush" Value="{StaticResource ButtonBorder}" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Focusable" Value="False" /> <Setter Property="Focusable" Value="False" />
@ -1466,7 +1470,7 @@
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Grid> <Grid>
<Border <Border
Background="{StaticResource SecondaryBrush}" Background="{StaticResource ComplementaryBrush}"
CornerRadius="3" CornerRadius="3"
Opacity="0.7"> Opacity="0.7">
<Border.Effect> <Border.Effect>
@ -1498,14 +1502,14 @@
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true"> <Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" Value="{StaticResource MouseOverButtonBackground}" /> <Setter Property="Background" Value="{StaticResource DarkHoverBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource DarkSecondaryBrush}" /> <Setter Property="BorderBrush" Value="{StaticResource DarkComplementaryBrush}" />
<Setter Property="Foreground" Value="{StaticResource MouseOverButtonForeground}" /> <Setter Property="Foreground" Value="{StaticResource ComplementaryBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsPressed" Value="true"> <Trigger Property="IsPressed" Value="true">
<Setter Property="Background" Value="{StaticResource PressedButtonBackground}" /> <Setter Property="Background" Value="{StaticResource PressedButtonBackground}" />
<Setter Property="BorderBrush" Value="{StaticResource SecondaryBrush}" /> <Setter Property="BorderBrush" Value="{StaticResource ComplementaryBrush}" />
<Setter Property="Foreground" Value="{StaticResource ButtonForeground}" /> <Setter Property="Foreground" Value="{StaticResource IntenseComplementaryBrush}" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="false"> <Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="{StaticResource DisabledButtonForeground}" /> <Setter Property="Foreground" Value="{StaticResource DisabledButtonForeground}" />

67
Wabbajack/Views/Installers/InstallationView.xaml
View File

@ -256,23 +256,74 @@
Grid.Row="0" Grid.Row="0"
Margin="30,5" Margin="30,5"
Command="{Binding OpenReadmeCommand}" Command="{Binding OpenReadmeCommand}"
Content="Readme"
FontSize="20" FontSize="20"
ToolTip="Open the readme for the modlist" /> ToolTip="Open the readme for the modlist">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30" />
<ColumnDefinition Width="82" />
</Grid.ColumnDefinitions>
<icon:PackIconFontAwesome
Grid.Column="0"
Width="30"
Height="30"
VerticalAlignment="Center"
Kind="ReadmeBrands" />
<TextBlock
Grid.Column="1"
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="Readme" />
</Grid>
</Button>
<Button <Button
Grid.Row="1" Grid.Row="1"
Margin="30,5" Margin="30,5"
Command="{Binding VisitWebsiteCommand}" Command="{Binding VisitWebsiteCommand}"
Content="Website"
FontSize="20" FontSize="20"
ToolTip="Open the webpage for the modlist" /> ToolTip="Open the webpage for the modlist">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30" />
<ColumnDefinition Width="82" />
</Grid.ColumnDefinitions>
<icon:PackIconMaterial
Grid.Column="0"
Width="30"
Height="30"
VerticalAlignment="Center"
Kind="Web" />
<TextBlock
Grid.Column="1"
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="Website" />
</Grid>
</Button>
<Button <Button
Grid.Row="2" Grid.Row="2"
Margin="30,5" Margin="30,5"
Command="{Binding ShowReportCommand}" Command="{Binding ShowReportCommand}"
Content="Manifest"
FontSize="20" FontSize="20"
ToolTip="Open an explicit listing of all actions this modlist will take" /> ToolTip="Open an explicit listing of all actions this modlist will take">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30" />
<ColumnDefinition Width="82" />
</Grid.ColumnDefinitions>
<icon:PackIconOcticons
Grid.Column="0"
Width="30"
Height="30"
VerticalAlignment="Center"
Kind="Checklist" />
<TextBlock
Grid.Column="1"
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="Manifest" />
</Grid>
</Button>
</Grid> </Grid>
<Grid <Grid
x:Name="InstallationConfigurationView" x:Name="InstallationConfigurationView"
@ -314,8 +365,8 @@
Grid.Column="2" Grid.Column="2"
Height="30" Height="30"
VerticalAlignment="Center" VerticalAlignment="Center"
PickerVM="{Binding ModListLocation}" FontSize="14"
FontSize="14" /> PickerVM="{Binding ModListLocation}" />
<ContentPresenter <ContentPresenter
Grid.Row="3" Grid.Row="3"
Grid.Column="0" Grid.Column="0"