Skip to content

Commit 406ca56

Browse files
committed
Introduce aarch64 architecture class
1 parent 8d4547c commit 406ca56

3 files changed

Lines changed: 44 additions & 9 deletions

File tree

media/css/cms/pages/flare26-channels.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,18 @@ ul.download-list strong {
173173
}
174174

175175
/* 64-bit UA detection for Firefox on Windows (issue #8635) */
176+
.windows.x64 .download-button .os_win {
177+
display: none !important;
178+
}
176179
.windows.x64 .download-button .os_win64 {
177180
display: block !important;
178181
}
179-
180-
.windows.x64 .download-button .os_win {
182+
.windows.aarch64 .download-button .os_win {
181183
display: none !important;
182184
}
185+
.windows.aarch64 .download-button .os_win64-aarch64 {
186+
display: block !important;
187+
}
183188

184189
/* add spacing between displayed buttons */
185190
.download-list {

media/css/protocol/components/_download-button.scss

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,37 @@ ul.download-list {
102102
}
103103

104104
// 64-bit UA detection for Firefox on Windows (issue #8635)
105+
.windows.x64 .download-button .os_win {
106+
display: none !important;
107+
}
105108
.windows.x64 .download-button .os_win64 {
106109
display: block !important;
107110
}
108-
109-
.windows.x64 .download-button .os_win {
111+
.windows.aarch64 .download-button .os_win {
110112
display: none !important;
111113
}
112114

115+
.windows.aarch64 .download-button .os_win64-aarch64 {
116+
display: block !important;
117+
}
118+
113119
// add spacing between displayed buttons
114120
.download-list {
115121
display: grid;
116122
gap: $spacing-md;
117123
}
118124

119-
// 64-bit UA detection for Firefox Beta on Windows (issue #10194)
120-
.windows.x64 .download-button-beta .os_win {
125+
/* 64-bit UA detection for Firefox on Windows (issue #8635) */
126+
.windows.x64 .download-button .os_win {
121127
display: none !important;
122128
}
123-
124-
.windows.x64 .download-button-beta .os_win64 {
129+
.windows.x64 .download-button .os_win64 {
130+
display: block !important;
131+
}
132+
.windows.aarch64 .download-button .os_win {
133+
display: none !important;
134+
}
135+
.windows.aarch64 .download-button .os_win64-aarch64 {
125136
display: block !important;
126137
}
127138

media/js/base/site.js

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,17 @@
121121
getPlatformClass: function (platform, platformVersion, archSize) {
122122
var classString = document.documentElement.className;
123123
var _version = platformVersion ? parseFloat(platformVersion) : 0;
124+
var forcedArchitecture = new URLSearchParams(
125+
window.location.search
126+
).get('installer_arch');
124127

125128
if (platform === 'windows') {
129+
forcedArchitecture = {
130+
1: 'win',
131+
2: 'win64',
132+
3: 'win64-aarch64'
133+
}[forcedArchitecture];
134+
126135
// Detect Windows 10 "and up" to display installation
127136
// messaging on the /thanks/ page.
128137

@@ -136,6 +145,10 @@
136145
classString += ' fx-unsupported';
137146
window.site.fxSupported = false;
138147
}
148+
149+
if (forcedArchitecture !== undefined) {
150+
archSize = forcedArchitecture === 'win' ? 32 : 64;
151+
}
139152
} else {
140153
classString = classString.replace('windows', platform);
141154
}
@@ -149,8 +162,14 @@
149162
}
150163
}
151164

165+
if (
166+
platform === 'windows' &&
167+
forcedArchitecture === 'win64-aarch64'
168+
) {
169+
classString += ' aarch64';
170+
}
152171
// Used for 64bit download link on Linux and Firefox Beta on Windows.
153-
if (archSize === 64) {
172+
else if (archSize === 64) {
154173
classString += ' x64';
155174
}
156175

0 commit comments

Comments
 (0)