From 7e82dc4436df49d2a07e477763916635d7349ce9 Mon Sep 17 00:00:00 2001
From: 1011025m <37438176+1011025m@users.noreply.github.com>
Date: Sat, 13 May 2023 10:31:05 +0800
Subject: [PATCH] Didn't pass the -a flag in git...

---
 Bloxstrap/App.xaml                            | 2 ++
 Bloxstrap/Bloxstrap.csproj                    | 1 +
 Bloxstrap/Dialogs/ByfronDialog.xaml           | 8 ++++++--
 Bloxstrap/ViewModels/ByfronDialogViewModel.cs | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Bloxstrap/App.xaml b/Bloxstrap/App.xaml
index 8f4642f..3ac28c3 100644
--- a/Bloxstrap/App.xaml
+++ b/Bloxstrap/App.xaml
@@ -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>
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
index 05de60f..60a5348 100644
--- a/Bloxstrap/Bloxstrap.csproj
+++ b/Bloxstrap/Bloxstrap.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <Resource Include="Bloxstrap.ico" />
+    <Resource Include="Fonts\Rubik-VariableFont_wght.ttf"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Bloxstrap/Dialogs/ByfronDialog.xaml b/Bloxstrap/Dialogs/ByfronDialog.xaml
index be0b987..30dd0ab 100644
--- a/Bloxstrap/Dialogs/ByfronDialog.xaml
+++ b/Bloxstrap/Dialogs/ByfronDialog.xaml
@@ -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>
diff --git a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs b/Bloxstrap/ViewModels/ByfronDialogViewModel.cs
index d1743d5..7609046 100644
--- a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs
+++ b/Bloxstrap/ViewModels/ByfronDialogViewModel.cs
@@ -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)