From 2e87f7cb90f73d74c9575832b3d8166fc3017937 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Dec 2025 09:04:21 +0000 Subject: [PATCH] Clean up unused icons and deduplicate (#31382) * Remove unused icons Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Consolidate brand icons Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove unused icons Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/img/compound/back-30s-24px.svg | 4 --- res/img/compound/forward-30s-24px.svg | 4 --- res/img/compound/live-16px.svg | 7 ----- res/img/compound/live-8px.svg | 7 ----- res/img/compound/record-10px.svg | 3 --- res/img/compound/stop-16.svg | 3 --- res/img/compound/timer-16px.svg | 3 --- .../element-icons/brands}/linux.svg | 0 .../element-icons/brands}/microsoft.svg | 0 res/img/element-icons/live.svg | 27 ------------------- res/img/element-icons/room/files.svg | 3 --- res/img/element-icons/roomlist/browse.svg | 4 --- res/img/element-icons/settings/devices.svg | 5 ---- res/img/element-icons/settings/help.svg | 3 --- res/img/element-icons/settings/keyboard.svg | 3 --- res/img/element-icons/settings/sidebar.svg | 3 --- res/img/element-icons/view-community.svg | 3 --- res/themes/element/img/compound/apple.svg | 3 --- src/async-components/structures/ErrorView.tsx | 6 ++--- 19 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 res/img/compound/back-30s-24px.svg delete mode 100644 res/img/compound/forward-30s-24px.svg delete mode 100644 res/img/compound/live-16px.svg delete mode 100644 res/img/compound/live-8px.svg delete mode 100644 res/img/compound/record-10px.svg delete mode 100644 res/img/compound/stop-16.svg delete mode 100644 res/img/compound/timer-16px.svg rename res/{themes/element/img/compound => img/element-icons/brands}/linux.svg (100%) rename res/{themes/element/img/compound => img/element-icons/brands}/microsoft.svg (100%) delete mode 100644 res/img/element-icons/live.svg delete mode 100644 res/img/element-icons/room/files.svg delete mode 100644 res/img/element-icons/roomlist/browse.svg delete mode 100644 res/img/element-icons/settings/devices.svg delete mode 100644 res/img/element-icons/settings/help.svg delete mode 100644 res/img/element-icons/settings/keyboard.svg delete mode 100644 res/img/element-icons/settings/sidebar.svg delete mode 100644 res/img/element-icons/view-community.svg delete mode 100644 res/themes/element/img/compound/apple.svg diff --git a/res/img/compound/back-30s-24px.svg b/res/img/compound/back-30s-24px.svg deleted file mode 100644 index c958c40a64..0000000000 --- a/res/img/compound/back-30s-24px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/compound/forward-30s-24px.svg b/res/img/compound/forward-30s-24px.svg deleted file mode 100644 index b071aa3ed2..0000000000 --- a/res/img/compound/forward-30s-24px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/compound/live-16px.svg b/res/img/compound/live-16px.svg deleted file mode 100644 index d7be98c008..0000000000 --- a/res/img/compound/live-16px.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/compound/live-8px.svg b/res/img/compound/live-8px.svg deleted file mode 100644 index 968c61f9e3..0000000000 --- a/res/img/compound/live-8px.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/compound/record-10px.svg b/res/img/compound/record-10px.svg deleted file mode 100644 index a16ce774b0..0000000000 --- a/res/img/compound/record-10px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/stop-16.svg b/res/img/compound/stop-16.svg deleted file mode 100644 index 439deb0d93..0000000000 --- a/res/img/compound/stop-16.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/timer-16px.svg b/res/img/compound/timer-16px.svg deleted file mode 100644 index 4eb1b0ee49..0000000000 --- a/res/img/compound/timer-16px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/themes/element/img/compound/linux.svg b/res/img/element-icons/brands/linux.svg similarity index 100% rename from res/themes/element/img/compound/linux.svg rename to res/img/element-icons/brands/linux.svg diff --git a/res/themes/element/img/compound/microsoft.svg b/res/img/element-icons/brands/microsoft.svg similarity index 100% rename from res/themes/element/img/compound/microsoft.svg rename to res/img/element-icons/brands/microsoft.svg diff --git a/res/img/element-icons/live.svg b/res/img/element-icons/live.svg deleted file mode 100644 index 31341f1ef6..0000000000 --- a/res/img/element-icons/live.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/res/img/element-icons/room/files.svg b/res/img/element-icons/room/files.svg deleted file mode 100644 index 6648ab00a5..0000000000 --- a/res/img/element-icons/room/files.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/browse.svg b/res/img/element-icons/roomlist/browse.svg deleted file mode 100644 index 04714e2881..0000000000 --- a/res/img/element-icons/roomlist/browse.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/settings/devices.svg b/res/img/element-icons/settings/devices.svg deleted file mode 100644 index 4d2f171993..0000000000 --- a/res/img/element-icons/settings/devices.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/res/img/element-icons/settings/help.svg b/res/img/element-icons/settings/help.svg deleted file mode 100644 index 2ac4f675ec..0000000000 --- a/res/img/element-icons/settings/help.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/settings/keyboard.svg b/res/img/element-icons/settings/keyboard.svg deleted file mode 100644 index aec7a9ec82..0000000000 --- a/res/img/element-icons/settings/keyboard.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/settings/sidebar.svg b/res/img/element-icons/settings/sidebar.svg deleted file mode 100644 index dddb9dca00..0000000000 --- a/res/img/element-icons/settings/sidebar.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/view-community.svg b/res/img/element-icons/view-community.svg deleted file mode 100644 index 9bd7115a47..0000000000 --- a/res/img/element-icons/view-community.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/themes/element/img/compound/apple.svg b/res/themes/element/img/compound/apple.svg deleted file mode 100644 index 5e9c996e1c..0000000000 --- a/res/themes/element/img/compound/apple.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index 9c0ba96dc0..fe7b00468a 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -12,9 +12,9 @@ import { Flex } from "@element-hq/web-shared-components"; import SdkConfig from "../../SdkConfig"; import { _t } from "../../languageHandler"; -import { Icon as AppleIcon } from "../../../res/themes/element/img/compound/apple.svg"; -import { Icon as MicrosoftIcon } from "../../../res/themes/element/img/compound/microsoft.svg"; -import { Icon as LinuxIcon } from "../../../res/themes/element/img/compound/linux.svg"; +import { Icon as AppleIcon } from "../../../res/img/element-icons/brands/apple.svg"; +import { Icon as MicrosoftIcon } from "../../../res/img/element-icons/brands/microsoft.svg"; +import { Icon as LinuxIcon } from "../../../res/img/element-icons/brands/linux.svg"; // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk // PostCSS variables will be accessible.