From 69de75b3900f0bc648f2094a54b29309f9560ad4 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 6 May 2025 13:27:09 +0100 Subject: [PATCH 1/2] feat(changelog): add github releases button --- res/css/_components.pcss | 1 + .../tabs/user/_ChangelogUserSettingsTab.pcss | 15 ++++++++ .../tabs/user/ChangelogUserSettingsTab.tsx | 35 ++++++++++++++----- src/i18n/strings/en_EN.json | 1 + 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 res/css/views/settings/tabs/user/_ChangelogUserSettingsTab.pcss diff --git a/res/css/_components.pcss b/res/css/_components.pcss index 12a81c68805..42cffc7f7b4 100644 --- a/res/css/_components.pcss +++ b/res/css/_components.pcss @@ -380,6 +380,7 @@ @import "./views/settings/tabs/user/_PreferencesUserSettingsTab.pcss"; @import "./views/settings/tabs/user/_SecurityUserSettingsTab.pcss"; @import "./views/settings/tabs/user/_SidebarUserSettingsTab.pcss"; +@import "./views/settings/tabs/user/_ChangelogUserSettingsTab.pcss"; @import "./views/spaces/_SpaceBasicSettings.pcss"; @import "./views/spaces/_SpaceChildrenPicker.pcss"; @import "./views/spaces/_SpaceCreateMenu.pcss"; diff --git a/res/css/views/settings/tabs/user/_ChangelogUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_ChangelogUserSettingsTab.pcss new file mode 100644 index 00000000000..ee4a1117b02 --- /dev/null +++ b/res/css/views/settings/tabs/user/_ChangelogUserSettingsTab.pcss @@ -0,0 +1,15 @@ +/* +Copyright 2025 hazzuk. + +SPDX-License-Identifier: AGPL-3.0-only +Please see LICENSE files in the repository root for full details. +*/ + +.mx_ChangelogDescription_buttons { + display: flex; + gap: var(--cpd-space-4x); + + svg { + margin-left: var(--cpd-space-2x); + } +} diff --git a/src/components/views/settings/tabs/user/ChangelogUserSettingsTab.tsx b/src/components/views/settings/tabs/user/ChangelogUserSettingsTab.tsx index 66d4d5fee37..ad8a688de5d 100644 --- a/src/components/views/settings/tabs/user/ChangelogUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/ChangelogUserSettingsTab.tsx @@ -18,7 +18,8 @@ import DOMPurify from "dompurify"; import { SettingsSubsectionText } from "../../shared/SettingsSubsection"; import SdkConfig from "../../../../../SdkConfig"; -const CHANGELOG_URL = "https://roadmap.elecord.app/"; +const ROADMAP_URL = "https://roadmap.elecord.app/"; +const RELEASES_URL = "https://github.com/elecordapp/elecord-web/releases"; const ChangelogUserSettingsTab: React.FC = () => { const [changelog, setChangelog] = useState(""); @@ -26,8 +27,13 @@ const ChangelogUserSettingsTab: React.FC = () => { const [error, setError] = useState(null); // open external roadmap - const onOpenChangelog = (): void => { - window.open(CHANGELOG_URL, "_blank"); + const onOpenRoadmap = (): void => { + window.open(ROADMAP_URL, "_blank"); + }; + + // open github releases + const onOpenReleases = (): void => { + window.open(RELEASES_URL, "_blank"); }; // fetch LATEST.md changelog @@ -67,16 +73,29 @@ const ChangelogUserSettingsTab: React.FC = () => { return ( + + {/* description */} {_t("settings|changelog|description", { brand: SdkConfig.get("brand") })} - {/* roadmap button */} - - {_t("settings|changelog|roadmap")} - - + + {/* external links */} +
+ {/* roadmap button */} + + {_t("settings|changelog|roadmap")} + + + {/* releases button */} + + {_t("settings|changelog|releases")} + + +
+ {/* render changelog */}
+ ); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 432fad38028..f2daccf1404 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2469,6 +2469,7 @@ "latest_changes": "Latest changes", "loading_changelog": "Loading changelog…", "roadmap": "Roadmap", + "releases": "Release history", "description": "Read about %(brand)s's latest new features and bug fixes here. Or see what's coming next by checking out the roadmap." }, "code_block_expand_default": "Expand code blocks by default", From 52c27fc2fcc92327739143813d9fdc9ecb02959f Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 6 May 2025 13:28:54 +0100 Subject: [PATCH 2/2] fix(rpc): download button has no internal margin Previously, the download button text and it's icon had no spacing between one another. --- .../views/settings/tabs/user/RichPresenceUserSettingsTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/tabs/user/RichPresenceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/RichPresenceUserSettingsTab.tsx index ff4808c0a3d..1791088efbb 100644 --- a/src/components/views/settings/tabs/user/RichPresenceUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/RichPresenceUserSettingsTab.tsx @@ -51,7 +51,7 @@ const RichPresenceUserSettingsTab: React.FC = () => { {/* download button */} {_t("settings|rich_presence|download_button")} - + {/* detection notice */}