Didn't pass the -a flag in git...

This commit is contained in:
1011025m 2023-05-13 10:31:05 +08:00
parent 066fda920e
commit 7e82dc4436
4 changed files with 10 additions and 3 deletions

View File

@ -11,6 +11,8 @@
<ui:ThemesDictionary Theme="Dark" />
<ui:ControlsDictionary />
</ResourceDictionary.MergedDictionaries>
<FontFamily x:Key="Rubik">pack://application:,,,/Fonts/#Rubik Light</FontFamily>
</ResourceDictionary>
</Application.Resources>
</Application>

View File

@ -14,6 +14,7 @@
<ItemGroup>
<Resource Include="Bloxstrap.ico" />
<Resource Include="Fonts\Rubik-VariableFont_wght.ttf"/>
</ItemGroup>
<ItemGroup>

View File

@ -23,7 +23,7 @@
</Path>
</Button>
<Grid Margin="12,12,36,12" VerticalAlignment="Top" Height="20">
<TextBlock VerticalAlignment="Center" TextAlignment="Left" Foreground="{Binding Foreground}" FontSize="12" Text="{Binding Version}" />
<TextBlock VerticalAlignment="Center" TextAlignment="Left" Foreground="{Binding Foreground}" FontFamily="{StaticResource Rubik}" FontSize="12" Text="{Binding Version}" />
</Grid>
<Path Fill="{Binding IconColor}" Width="300" Height="56" Stretch="Fill">
<Path.Data>
@ -35,7 +35,11 @@
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Margin="0,0,0,21" TextAlignment="Center" Grid.Row="0" FontSize="18" Text="{Binding Message}" Foreground="{Binding Foreground}" FontFamily="Source Sans Pro" />
<TextBlock Margin="0,0,0,21" TextAlignment="Center" Grid.Row="0" Text="{Binding Message}" Foreground="{Binding Foreground}" FontFamily="{StaticResource Rubik}" FontSize="18" FontWeight="Light">
<TextBlock.LayoutTransform>
<ScaleTransform ScaleY="0.9"/>
</TextBlock.LayoutTransform>
</TextBlock>
<ProgressBar Grid.Row="1" Width="480" Height="12" Foreground="{Binding Foreground}" Background="{Binding ProgressBarBackground}" BorderThickness="0" IsIndeterminate="{Binding ProgressIndeterminate}" Value="{Binding ProgressValue}"></ProgressBar>
</Grid>
</Grid>

View File

@ -12,7 +12,7 @@ namespace Bloxstrap.ViewModels
// Using dark theme for default values.
public Thickness DialogBorder { get; set; } = new Thickness(0);
public Brush Background { get; set; } = Brushes.Black;
public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(235, 235, 235));
public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(239, 239, 239));
public Brush IconColor { get; set; } = new SolidColorBrush(Color.FromRgb(255, 255, 255));
public Brush ProgressBarBackground { get; set; } = new SolidColorBrush(Color.FromRgb(86, 86, 86));
public ByfronDialogViewModel(IBootstrapperDialog dialog) : base(dialog)