From f0d9e05f8565a62b2eec1482b37538ace0aca7da Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 10 Feb 2025 10:49:58 +0000
Subject: [PATCH] Amalgamate duplicated CSS files

---
 res/css/_components.pcss                      |  3 +--
 ...ePanel.pcss => _DestructiveComponent.pcss} |  9 ++++---
 .../encryption/_ResetIdentityPanel.pcss       | 26 -------------------
 .../encryption/DeleteKeyStoragePanel.tsx      |  6 ++---
 .../encryption/ResetIdentityPanel.tsx         |  6 ++---
 5 files changed, 13 insertions(+), 37 deletions(-)
 rename res/css/views/settings/encryption/{_DeleteKeyStoragePanel.pcss => _DestructiveComponent.pcss} (72%)
 delete mode 100644 res/css/views/settings/encryption/_ResetIdentityPanel.pcss

diff --git a/res/css/_components.pcss b/res/css/_components.pcss
index 0fb5474c70..bf6c223a2d 100644
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -358,10 +358,9 @@
 @import "./views/settings/_UserProfileSettings.pcss";
 @import "./views/settings/encryption/_AdvancedPanel.pcss";
 @import "./views/settings/encryption/_ChangeRecoveryKey.pcss";
-@import "./views/settings/encryption/_DeleteKeyStoragePanel.pcss";
+@import "./views/settings/encryption/_DestructiveComponent.pcss";
 @import "./views/settings/encryption/_EncryptionCard.pcss";
 @import "./views/settings/encryption/_RecoveryPanelOutOfSync.pcss";
-@import "./views/settings/encryption/_ResetIdentityPanel.pcss";
 @import "./views/settings/tabs/_SettingsBanner.pcss";
 @import "./views/settings/tabs/_SettingsIndent.pcss";
 @import "./views/settings/tabs/_SettingsSection.pcss";
diff --git a/res/css/views/settings/encryption/_DeleteKeyStoragePanel.pcss b/res/css/views/settings/encryption/_DestructiveComponent.pcss
similarity index 72%
rename from res/css/views/settings/encryption/_DeleteKeyStoragePanel.pcss
rename to res/css/views/settings/encryption/_DestructiveComponent.pcss
index 14310e5592..0f3ddfb705 100644
--- a/res/css/views/settings/encryption/_DeleteKeyStoragePanel.pcss
+++ b/res/css/views/settings/encryption/_DestructiveComponent.pcss
@@ -5,8 +5,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-.mx_DeleteKeyStoragePanel {
-    .mx_DeleteKeyStoragePanel_content {
+/**
+ * Shared by multiple components that confirm a destructive action in the user settings dialog.
+ */
+.mx_DestructiveComponent {
+    .mx_DestructiveComponent_content {
         display: flex;
         flex-direction: column;
         gap: var(--cpd-space-3x);
@@ -17,7 +20,7 @@
         }
     }
 
-    .mx_DeleteKeyStoragePanel_footer {
+    .mx_DestructiveComponent_footer {
         display: flex;
         flex-direction: column;
         gap: var(--cpd-space-4x);
diff --git a/res/css/views/settings/encryption/_ResetIdentityPanel.pcss b/res/css/views/settings/encryption/_ResetIdentityPanel.pcss
deleted file mode 100644
index e4e05638ce..0000000000
--- a/res/css/views/settings/encryption/_ResetIdentityPanel.pcss
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-.mx_ResetIdentityPanel {
-    .mx_ResetIdentityPanel_content {
-        display: flex;
-        flex-direction: column;
-        gap: var(--cpd-space-3x);
-
-        > span {
-            font: var(--cpd-font-body-md-medium);
-            text-align: center;
-        }
-    }
-
-    .mx_ResetIdentityPanel_footer {
-        display: flex;
-        flex-direction: column;
-        gap: var(--cpd-space-4x);
-        justify-content: center;
-    }
-}
diff --git a/src/components/views/settings/encryption/DeleteKeyStoragePanel.tsx b/src/components/views/settings/encryption/DeleteKeyStoragePanel.tsx
index bcc76c48ca..989139cd6e 100644
--- a/src/components/views/settings/encryption/DeleteKeyStoragePanel.tsx
+++ b/src/components/views/settings/encryption/DeleteKeyStoragePanel.tsx
@@ -51,9 +51,9 @@ export function DeleteKeyStoragePanel({ onFinish }: Props): JSX.Element {
                 Icon={ErrorIcon}
                 destructive={true}
                 title={_t("settings|encryption|delete_key_storage|title")}
-                className="mx_DeleteKeyStoragePanel"
+                className="mx_DestructiveComponent"
             >
-                <div className="mx_DeleteKeyStoragePanel_content">
+                <div className="mx_DestructiveComponent_content">
                     {_t("settings|encryption|delete_key_storage|description")}
                     <VisualList>
                         <VisualListItem Icon={CrossIcon} destructive={true}>
@@ -64,7 +64,7 @@ export function DeleteKeyStoragePanel({ onFinish }: Props): JSX.Element {
                         </VisualListItem>
                     </VisualList>
                 </div>
-                <div className="mx_DeleteKeyStoragePanel_footer">
+                <div className="mx_DestructiveComponent_footer">
                     <Button destructive={true} onClick={onDeleteClick} disabled={busy}>
                         {_t("settings|encryption|delete_key_storage|confirm")}
                     </Button>
diff --git a/src/components/views/settings/encryption/ResetIdentityPanel.tsx b/src/components/views/settings/encryption/ResetIdentityPanel.tsx
index 40475b2ad1..3208da837e 100644
--- a/src/components/views/settings/encryption/ResetIdentityPanel.tsx
+++ b/src/components/views/settings/encryption/ResetIdentityPanel.tsx
@@ -58,9 +58,9 @@ export function ResetIdentityPanel({ onCancelClick, onFinish, variant }: ResetId
                         ? _t("settings|encryption|advanced|breadcrumb_title_forgot")
                         : _t("settings|encryption|advanced|breadcrumb_title")
                 }
-                className="mx_ResetIdentityPanel"
+                className="mx_DestructiveComponent"
             >
-                <div className="mx_ResetIdentityPanel_content">
+                <div className="mx_DestructiveComponent_content">
                     <VisualList>
                         <VisualListItem Icon={CheckIcon} success={true}>
                             {_t("settings|encryption|advanced|breadcrumb_first_description")}
@@ -74,7 +74,7 @@ export function ResetIdentityPanel({ onCancelClick, onFinish, variant }: ResetId
                     </VisualList>
                     {variant === "compromised" && <span>{_t("settings|encryption|advanced|breadcrumb_warning")}</span>}
                 </div>
-                <div className="mx_ResetIdentityPanel_footer">
+                <div className="mx_DestructiveComponent_footer">
                     <Button
                         destructive={true}
                         onClick={async (evt) => {