Skip to content

Commit 0ead0b0

Browse files
authored
Add support for multiarch downloads in 8.1 (#3922)
* Add download options for Intel, AMD, and ARM 64-bit * Refactor dialog styles for better option layout * Reorder release information in config example * Refactor dialog option styles for better specificity * Adjust dialog option margins and styles Updated margin styles for dialog options and titles. * Revise download modal content for clarity Updated the download modal text to clarify the choice of OS variant. * Increase max-width of dialog paragraph * Update download modal title for clarity * Add close button to download modal in index.php * Remove padding-top from main.css Removed extra padding-top from the element.
1 parent aa196e9 commit 0ead0b0

3 files changed

Lines changed: 53 additions & 17 deletions

File tree

_backend/config.example.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
return array(
77
'release_title' => 'Circe',
88
'release_version' => '8.1',
9-
'release_filename' => 'elementaryos-8.1-stable-amd64.20251211.iso',
109
'release_size' => '3.3 GB',
10+
'release_faq' => 'https://github.com/elementary/os/wiki/OS-8-FAQ',
11+
12+
'release_filename' => 'elementaryos-8.1-stable-amd64.20251211.iso',
1113
'release_magnet' => 'addc43b83201d733d7558e431b692c10e2f53f84',
1214
'release_sha256' => 'eee6cad081664717681bec767fbfe1aa1fd920938fedad6c83b41fd341e8f306',
13-
'release_faq' => 'https://github.com/elementary/os/wiki/OS-8-FAQ',
15+
16+
'release_arm_filename' => 'elementaryos-8.1-stable-arm64.20251211.iso',
17+
'release_arm_magnet' => '2be4ebcb8a5c60b230f0e9eab9fdaf80694a2395dc2a7b128321f8354253046a',
18+
'release_arm_sha256' => 'b52b2a0195015e351db1ac1183f5d9263db9a254',
1419

1520
'previous_title' => 'Circe',
1621
'previous_version' => '8.0.2',

_styles/main.css

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,6 @@ So that for browsers that dont we can have a sensible inline style that can be a
10461046
0 3px 28px 2px rgba(0, 0, 0, 0.12),
10471047
0 5px 10px -3px rgba(0, 0, 0, 0.4);
10481048
padding: 12px;
1049-
padding-top: 24px;
10501049
text-align: initial;
10511050
}
10521051

@@ -1084,18 +1083,30 @@ So that for browsers that dont we can have a sensible inline style that can be a
10841083
margin: 0 auto;
10851084
text-align: left;
10861085
line-height: 24px;
1087-
max-width: 380px;
1086+
max-width: 420px;
10881087
}
10891088

10901089
.dialog[open] p {
10911090
margin: 6px 0 0;
10921091
}
10931092

1094-
.dialog .action-area {
1095-
margin-top: 12px;
1093+
.dialog .dialog-option {
1094+
margin: 24px 0 12px;
1095+
}
1096+
1097+
.dialog .dialog-option-title {
1098+
opacity: 0.8;
1099+
font-size: 0.8em;
1100+
margin: 0;
10961101
}
10971102

1098-
.dialog[open] .action-area {
1103+
.dialog p.dialog-option-subtitle {
1104+
opacity: 0.7;
1105+
font-size: 0.7em;
1106+
margin: 0;
1107+
}
1108+
1109+
.dialog[open] .dialog-option {
10991110
display: flex;
11001111
flex-flow: row;
11011112
flex-wrap: wrap;
@@ -1112,12 +1123,20 @@ So that for browsers that dont we can have a sensible inline style that can be a
11121123
white-space: nowrap;
11131124
}
11141125

1115-
.dialog .action-area > .button + .button,
1116-
.dialog .action-area > .button + .linked {
1126+
.dialog .dialog-option > .button + .button,
1127+
.dialog .dialog-option > .button + .linked {
11171128
margin: 0;
11181129
margin-left: 6px;
11191130
}
11201131

1132+
.dialog .dialog-option > .download-link.http {
1133+
margin-left: auto;
1134+
}
1135+
1136+
.dialog .dialog-option > .download-link.magnet {
1137+
flex: 0 auto;
1138+
}
1139+
11211140
/* If the dialog is inline hide the close button */
11221141
.dialog .close-modal {
11231142
display: none;

index.php

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,28 @@
468468
<span id="translate-download" style="display:none;" hidden>Download elementary OS</span>
469469
<span id="translate-purchase" style="display:none;" hidden>Purchase elementary OS</span>
470470
<dialog id="download-modal" class="dialog" aria-labelledby="download-modal-title">
471+
<a class="js-close-button clickable close-modal"><img src="images/pantheon/actions/window-close.svg"></a>
471472
<img src="images/icons/apps/48/system-os-installer.svg" alt=""/>
472473
<div class="content-area">
473-
<h2 id="download-modal-title" class="dialog-title">Choose a Download</h2>
474-
<p>Download from a localized server or by magnet link. For help and more info, see the <a class="read-more" href="docs/installation" target="_blank" rel="noopener">installation guide</a></p>
475-
</div>
476-
<div class="action-area">
477-
<button class="js-close-button button clickable close-modal">Close</button>
478-
<div class="linked">
479-
<a class="button suggested-action download-link http" href="<?php echo $download_link.$config['release_filename']; ?>">Download</a>
480-
<a class="button suggested-action download-link magnet" title="Torrent Magnet Link" href="<?php echo 'magnet:?xt=urn:btih:'.$config['release_magnet'].'&dn='.$config['release_filename']; ?>&tr=https%3A%2F%2Fashrise.com%3A443%2Fphoenix%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&ws=http%3A<?php echo urlencode($download_link.$config['release_filename']); ?>"><i class="fa fa-magnet"></i></a>
474+
<h2 id="download-modal-title" class="dialog-title">Download elementary OS</h2>
475+
<p>Choose the variant of elementary OS for your computer's processor architecture.</p>
476+
<p>For help and more info, see the <a class="read-more" href="docs/installation" target="_blank" rel="noopener">installation guide</a></p>
477+
<hr>
478+
<div class="dialog-option">
479+
<div class="dialog-option-description">
480+
<h3 class="dialog-option-title">Intel or AMD 64-bit</h3>
481+
<p class="dialog-option-subtitle">Most PCs and older Macs</p>
482+
</div>
483+
<a class="button download-link http" href="<?php echo $download_link.$config['release_filename']; ?>">Download</a>
484+
<a class="button download-link magnet" title="Torrent Magnet Link" href="<?php echo 'magnet:?xt=urn:btih:'.$config['release_magnet'].'&dn='.$config['release_filename']; ?>&tr=https%3A%2F%2Fashrise.com%3A443%2Fphoenix%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&ws=http%3A<?php echo urlencode($download_link.$config['release_filename']); ?>"><i class="fa fa-magnet"></i></a>
485+
</div>
486+
<div class="dialog-option">
487+
<div class="dialog-option-description">
488+
<h3 class="dialog-option-title">ARM 64-bit</h3>
489+
<p class="dialog-option-subtitle">Apple Silicon, Raspberry Pi, etc</p>
490+
</div>
491+
<a class="button download-link http" href="<?php echo $download_link.$config['release_arm_filename']; ?>">Download</a>
492+
<a class="button download-link magnet" title="Torrent Magnet Link" href="<?php echo 'magnet:?xt=urn:btih:'.$config['release_arm_magnet'].'&dn='.$config['release_filename']; ?>&tr=https%3A%2F%2Fashrise.com%3A443%2Fphoenix%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&ws=http%3A<?php echo urlencode($download_link.$config['release_filename']); ?>"><i class="fa fa-magnet"></i></a>
481493
</div>
482494
</div>
483495
</dialog>

0 commit comments

Comments
 (0)