Skip to content

Commit

Permalink
button font change
Browse files Browse the repository at this point in the history
  • Loading branch information
fmmmlee committed Aug 11, 2020
1 parent 89c5c36 commit a6ac08f
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 17 deletions.
16 changes: 5 additions & 11 deletions application/GW2 Addon Manager/UI/OpeningPage/OpeningView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@
<TextBlock Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="320,0,0,37" FontFamily="Microsoft YaHei UI Light" FontSize="14">
<Run Text="Game Path"/>
</TextBlock>
<!--
horizontal stackpanel
link
link
link
-->

<TextBlock
Margin="110, 0, 0, -10"
HorizontalAlignment="Left"
Expand Down Expand Up @@ -309,13 +304,12 @@
Foreground="White"
Background="#7FABEFF9"
Click="update_button_clicked"
FontFamily="Footlight MT Light"
FontSize="18"
FontFamily="Microsoft YaHei UI"
FontSize="17"
BorderThickness="1"
BorderBrush="#FFC9C9C9"
Style="{StaticResource BigContentButton}"
>
</Button>
Style="{StaticResource BigContentButton}" FontWeight="Bold"
/>

</Grid>
</Page>
34 changes: 28 additions & 6 deletions application/GW2 Addon Manager/UI/UpdatingPage/UpdatingView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,28 @@
<Label PreviewMouseDown="TitleBar_MouseHeld"/>
</DockPanel>

<TextBlock
Margin="40, 0, 0, -10"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Background="Transparent"
Foreground="DimGray"
>
<Hyperlink NavigateUri="https://github.com/fmmmlee/GW2-Addon-Manager/wiki" RequestNavigate="Hyperlink_RequestNavigate" TextDecorations="None" FocusVisualStyle="{x:Null}">
<TextBlock Text="WIKI " FontFamily="Microsoft YaHei UI"/>
</Hyperlink>
|
<Hyperlink
NavigateUri="https://github.com/fmmmlee/GW2-Addon-Manager/wiki/Other-Useful-Programs"
RequestNavigate="Hyperlink_RequestNavigate"
TextDecorations="None"
FocusVisualStyle="{x:Null}"
ToolTip="Programs for GW2 not managed by GW2-UOAOM, such as TacO"
>
<TextBlock Text=" Companion Applications" FontFamily="Microsoft YaHei UI"/>
</Hyperlink>
</TextBlock>

<Label Grid.Row = "1" FontWeight="Bold" FontSize="60" Foreground="DimGray" Margin="30,0,0,0" FontFamily="Microsoft JhengHei UI Light" Width="Auto" HorizontalAlignment="Left">
GW2-UOAOM
</Label>
Expand Down Expand Up @@ -78,13 +100,13 @@
Margin="5"
Foreground="White"
Background="DimGray"
FontFamily="Footlight MT Light"
FontFamily="Microsoft YaHei UI"
FontSize="16"
BorderThickness="1"
BorderBrush="#FF6E6E6E"
Click="back_clicked"
IsEnabled="{Binding BackBtnEnabled}"
Style="{StaticResource BigContentButton}"
Style="{StaticResource BigContentButton}" FontWeight="Bold"
/>
<Button Grid.Column="2"
x:Name="closeProgram"
Expand All @@ -94,22 +116,22 @@
Margin="5, 5, 100, 5"
Foreground="White"
Background="#CC6795AA"
FontFamily="Footlight MT Light"
FontFamily="Microsoft YaHei UI"
FontSize="16"
BorderThickness="1"
BorderBrush="#FF6E6E6E"
Click="close_clicked"
IsEnabled="{Binding CloseBtnEnabled}"
Style="{StaticResource BigContentButton}"
Style="{StaticResource BigContentButton}" FontWeight="Bold"
/>
<CheckBox x:Name="launchOnClose"
Content="Launch game when closing"
Foreground="White"
Grid.Row="2"
Grid.Column="1"
Grid.ColumnSpan="2"
FontFamily="Footlight MT Light"
FontSize="16"
FontFamily="Microsoft YaHei UI"
FontSize="14"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Margin="5">
Expand Down

0 comments on commit a6ac08f

Please sign in to comment.