diff --git a/src/components/ReleaseDownloadButton/index.js b/src/components/ReleaseDownloadButton/index.js index 6ad9fe8..c949117 100644 --- a/src/components/ReleaseDownloadButton/index.js +++ b/src/components/ReleaseDownloadButton/index.js @@ -41,10 +41,10 @@ function toProperCase(str) { function getOSIcon(os, fillColor) { if (os === "windows") { return ; - } else if (os === "linux") { - return ; } else if (os === "macos") { return ; + } else if (os === "linux") { + return ; } else { return null; } @@ -88,6 +88,8 @@ function generateDropdownItems(release, os, assets, textRemovals, isNightly) { } else { displayName = "Download"; } + } else if (os === "macos") { + displayName = "Download"; } else if (os === "linux") { // Check for Flatpak or AppImage tags which will make Appimage - x64 Qt and Flatpak - x64 Qt and no way to seemingly fix the regular way if (asset.additionalTags.includes("appimage")) { @@ -97,8 +99,6 @@ function generateDropdownItems(release, os, assets, textRemovals, isNightly) { } else { displayName = toProperCase(displayName); // Capitalize the first letter for other cases like old Linux releases } - } else if (os === "macos") { - displayName = "Download"; } // Strip the "- x64 Qt" for Linux because it's being annoying with the tags and who cares about how good the code looks for now it's a bit of jank. @@ -164,15 +164,15 @@ function renderDropdownItems( , 0 ? "macOS" : "macOS - None Available"} + > + {macosItems} + , + 0 ? "Linux" : "Linux - None Available"} > {linuxItems} , - 0 ? "MacOS" : "MacOS - None Available"} - > - {macosItems} - , ); } return items; @@ -199,8 +199,8 @@ export function ReleaseDownloadButton({ // States to hold dropdown items for each platform const [windowsItems, setWindowsItems] = useState([]); - const [linuxItems, setLinuxItems] = useState([]); const [macosItems, setMacosItems] = useState([]); + const [linuxItems, setLinuxItems] = useState([]); // Effect to generate dropdown items when the release or other inputs change useEffect(() => { @@ -225,27 +225,6 @@ export function ReleaseDownloadButton({ ), ); } - if ("linux" in release) { - setLinuxItems( - generateDropdownItems( - release.linux, - "linux", - release.linux?.assets?.Linux, - ["Linux"], - isNightly, - ), - ); - } else { - setLinuxItems( - generateDropdownItems( - release, - "linux", - release.assets?.Linux, - ["Linux"], - isNightly, - ), - ); - } if ("macos" in release) { setMacosItems( generateDropdownItems( @@ -267,6 +246,27 @@ export function ReleaseDownloadButton({ ), ); } + if ("linux" in release) { + setLinuxItems( + generateDropdownItems( + release.linux, + "linux", + release.linux?.assets?.Linux, + ["Linux"], + isNightly, + ), + ); + } else { + setLinuxItems( + generateDropdownItems( + release, + "linux", + release.assets?.Linux, + ["Linux"], + isNightly, + ), + ); + } }, [release]); return ( diff --git a/src/css/custom.css b/src/css/custom.css index f124c9b..609e72b 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -405,22 +405,7 @@ table td { } .h1-icon { - fontsize: "1em"; - verticalalign: "middle"; -} - -.h1-icon-spacer { - fontsize: "0.5em"; - verticalalign: "middle"; - marginleft: "0.5em"; -} - -.stable-blue { - color: "#4b7cd7"; -} - -.nightly-orange { - color: "#b58d05"; + font-size: "1em"; } .imgCompareContainer { diff --git a/src/pages/downloads/index.js b/src/pages/downloads/index.js index 3c5b6b6..3aa4c10 100644 --- a/src/pages/downloads/index.js +++ b/src/pages/downloads/index.js @@ -128,14 +128,14 @@ export default function Downloads() { // is not actually a problem we currently have and should be solved at the API level setLatestStableRelease({ windows: getLatestRelease(data.stableReleases.data, "Windows"), - linux: getLatestRelease(data.stableReleases.data, "Linux"), macos: getLatestRelease(data.stableReleases.data, "MacOS"), + linux: getLatestRelease(data.stableReleases.data, "Linux"), }); setLatestNightlyRelease({ windows: getLatestRelease(data.nightlyReleases.data, "Windows"), - linux: getLatestRelease(data.nightlyReleases.data, "Linux"), macos: getLatestRelease(data.nightlyReleases.data, "MacOS"), + linux: getLatestRelease(data.nightlyReleases.data, "Linux"), }); setStableReleases(data.stableReleases); @@ -185,10 +185,12 @@ export default function Downloads() {
-

+

Stable Releases - - +

{apiErrorMsg !== undefined && ( @@ -204,7 +206,7 @@ export default function Downloads() { href="https://github.com/PCSX2/pcsx2/releases" target="_blank" rel="noreferrer" - className="stable-blue hover:underline" + className="text-blue-500 hover:underline" > GitHub @@ -232,7 +234,7 @@ export default function Downloads() {

If you need help using the emulator,{" "} - + see the documentation.

@@ -300,10 +302,12 @@ export default function Downloads() {
-

+

Nightly Releases - - +

{apiErrorMsg !== undefined && ( @@ -347,7 +351,7 @@ export default function Downloads() {

If you need help using the emulator,{" "} - + see the documentation.