Skip to content

Commit fc5a2ef

Browse files
wtgodbewtgodbe
committed
Update theme
1 parent b04bc07 commit fc5a2ef

File tree

3 files changed

+76
-69
lines changed

3 files changed

+76
-69
lines changed

‎src/Installers/Windows/WindowsHostingBundle/Bundle.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?foreach lcid in 2052;1028;1029;1031;3082;1033;1036;1040;1041;1042;1045;1046;1049;1055?>
66
<Payload Id="PL_thm_$(lcid)" SourceFile="LCID\$(lcid)\thm.wxl" Name="$(lcid)\thm.wxl" Compressed="yes" />
77
<?endforeach?>
8-
<Payload Name="DotNetLogo.bmp" Compressed="yes" SourceFile="DotNetLogo.bmp" />
8+
<Payload Name="DotNetLogo_256x.png" Compressed="yes" SourceFile="DotNetLogo_256x.png" />
99
</BootstrapperApplication>
1010

1111
<!-- Search references for upgrade policy keys -->

‎src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp‎

-12.1 KB
Binary file not shown.

‎src/Installers/Windows/WindowsHostingBundle/bundle.thm‎

Lines changed: 75 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,81 @@
11
<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
2-
<Window Width="485" Height="347" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
3-
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
4-
<Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
5-
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
6-
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
7-
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
2+
<!-- Use system colors where possible as they change based on themes and are automatically adjusted for high contrast.
3+
For custom colors, ensure the contrast ratio is at least 4.5:1 (3:1 for large text and other UI components).
4+
The WinUI 3 Gallery app can be used to calculate contrast settings. Take note that custom colors for <Font>
5+
elements use BGR instead of RGB ordering.
86

9-
<Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes" />
10-
<Text X="80" Y="11" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
11-
<Text X="80" Y="40" Width="-11" Height="40" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
7+
Line spacing for fonts should be rounded to the nearest multiple of 4. For example, Segoe UI with a height of 24 has
8+
a line spacing of 31.9, so 32 should be used when calculating the height of a control that contains a single line of text,
9+
like a label. For a height of 12, the line spacing to use is 16. -->
10+
<Font Id="DefaultFont" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
11+
<Font Id="WindowBannerFont" Height="-24" Weight="900" Foreground="000000" Background="D42B51">Segoe UI</Font>
12+
<Font Id="PageHeaderFont" Height="-22" Weight="500" Foreground="graytext" Background="window">Segoe UI</Font>
13+
<Font Id="ErrorFont" Height="-12" Weight="900" Foreground="windowtext" Background="window">Segoe UI</Font>
14+
<Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
15+
<ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_256x.png" Visible="yes" />
16+
<Text X="80" Y="11" Width="-11" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
17+
<Text X="80" Y="40" Width="-11" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
1218

13-
<Page Name="Help">
14-
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
15-
<Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
16-
<Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
17-
</Page>
18-
<Page Name="Install">
19-
<Hypertext X="11" Y="90" Width="-11" Height="15" FontId="3">#(loc.Welcome)</Hypertext>
20-
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="3" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
21-
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="3" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
22-
<Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="178" Width="-11" Height="51" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
23-
<Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
24-
<Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
25-
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
26-
</Page>
27-
<Page Name="FilesInUse">
28-
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
29-
<Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
30-
<Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
19+
<Page Name="Help">
20+
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.HelpHeader)</Text>
21+
<Text X="11" Y="112" Width="-11" Height="-35" FontId="DefaultFont" DisablePrefix="yes">#(loc.HelpText)</Text>
22+
<Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.HelpCloseButton)</Button>
23+
</Page>
24+
<Page Name="Install">
25+
<Hypertext X="11" Y="90" Width="-11" Height="15" FontId="DefaultFont">#(loc.Welcome)</Hypertext>
26+
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="DefaultFont" Name="InstallResetIIS" HideWhenDisabled="yes">#(loc.InstallResetIIS)</Hypertext>
27+
<Hypertext X="11" Y="119" Width="-11" Height="45" FontId="DefaultFont" Name="InstallNoIIS" HideWhenDisabled="yes">#(loc.InstallNoIIS)</Hypertext>
28+
<Hypertext Name="EulaAndPrivacyHyperlink" X="11" Y="178" Width="-11" Height="51" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.EulaPrivacy)</Hypertext>
29+
<Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="34" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
30+
<Button Name="InstallButton" X="-91" Y="-11" Width="95" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.InstallInstallButton)</Button>
31+
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.InstallCloseButton)</Button>
32+
</Page>
33+
<Page Name="FilesInUse">
34+
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
35+
<Text X="11" Y="121" Width="-11" Height="34" FontId="DefaultFont" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
36+
<Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="DefaultFont" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
3137

32-
<Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
33-
<Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
38+
<Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
39+
<Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
3440

35-
<Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
36-
<Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
37-
</Page>
38-
<Page Name="Progress">
39-
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
40-
<Text X="11" Y="121" Width="90" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
41-
<Text Name="OverallProgressPackageText" X="105" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
42-
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
43-
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
44-
</Page>
45-
<Page Name="Modify">
46-
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
47-
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="3" Name="ModifyResetIIS" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
48-
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="3" Name="ModifyNoIIS" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
49-
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
50-
<Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
51-
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
52-
</Page>
53-
<Page Name="Success">
54-
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
55-
<Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
56-
<Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
57-
<Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
58-
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
59-
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
60-
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
61-
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
62-
</Page>
63-
<Page Name="Failure">
64-
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
65-
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
66-
<Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
67-
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
68-
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
69-
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
70-
<Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
71-
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
72-
<Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
73-
</Page>
41+
<Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
42+
<Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.FilesInUseCancelButton)</Button>
43+
</Page>
44+
<Page Name="Progress">
45+
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
46+
<Text X="11" Y="121" Width="90" Height="17" FontId="DefaultFont" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
47+
<Text Name="OverallProgressPackageText" X="105" Y="121" Width="-11" Height="17" FontId="DefaultFont" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
48+
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
49+
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ProgressCancelButton)</Button>
50+
</Page>
51+
<Page Name="Modify">
52+
<Text X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
53+
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="DefaultFont" Name="ModifyResetIIS" HideWhenDisabled="yes">#(loc.ModifyResetIIS)</Hypertext>
54+
<Hypertext X="11" Y="121" Width="-11" Height="45" FontId="DefaultFont" Name="ModifyNoIIS" HideWhenDisabled="yes">#(loc.ModifyNoIIS)</Hypertext>
55+
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
56+
<Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ModifyUninstallButton)</Button>
57+
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.ModifyCloseButton)</Button>
58+
</Page>
59+
<Page Name="Success">
60+
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
61+
<Text Name="SuccessInstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
62+
<Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
63+
<Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="60" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
64+
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
65+
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
66+
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
67+
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.SuccessCloseButton)</Button>
68+
</Page>
69+
<Page Name="Failure">
70+
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
71+
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
72+
<Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
73+
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="PageHeaderFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
74+
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="DefaultFont" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
75+
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="ErrorFont" TabStop="yes" HideWhenDisabled="yes" />
76+
<Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="DefaultFont" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
77+
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
78+
<Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="DefaultFont">#(loc.FailureCloseButton)</Button>
79+
</Page>
80+
</Window>
7481
</Theme>

0 commit comments

Comments
 (0)