From 59609024e8318ee8e12355bffacf0c13885f807f Mon Sep 17 00:00:00 2001 From: yemkareems Date: Tue, 23 Sep 2025 17:44:20 +0530 Subject: [PATCH 1/3] fix: added 3 new light images for fb, bluesky and mastodon, included them in REUSE.toml Signed-off-by: yemkareems --- REUSE.toml | 6 +++--- core/img/bluesky-light.svg | 1 + core/img/facebook-light.svg | 1 + core/img/mastodon-light.svg | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 core/img/bluesky-light.svg create mode 100644 core/img/facebook-light.svg create mode 100644 core/img/mastodon-light.svg diff --git a/REUSE.toml b/REUSE.toml index 05a49bd80e46b..f70638e3fd27f 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -334,13 +334,13 @@ SPDX-FileCopyrightText = "X Corp." SPDX-License-Identifier = "LicenseRef-XTrademarks" [[annotations]] -path = ["core/img/bluesky.svg", "core/img/actions/bluesky.svg"] +path = ["core/img/bluesky.svg", "core/img/bluesky-light.svg", "core/img/actions/bluesky.svg"] precedence = "aggregate" SPDX-FileCopyrightText = "2012-2024 Fonticons, Inc." SPDX-License-Identifier = "CC-BY-4.0" [[annotations]] -path = ["core/img/facebook.svg", "apps/federatedfilesharing/img/social-facebook.svg"] +path = ["core/img/facebook.svg", "core/img/facebook-light.svg", "apps/federatedfilesharing/img/social-facebook.svg"] precedence = "aggregate" SPDX-FileCopyrightText = "2024 Meta" SPDX-License-Identifier = "LicenseRef-FacebookTrademarks" @@ -352,7 +352,7 @@ SPDX-FileCopyrightText = "2024 Diaspora" SPDX-License-Identifier = "LicenseRef-DiasporaTrademarks" [[annotations]] -path = ["core/img/mastodon.svg", "core/img/actions/mastodon.svg"] +path = ["core/img/mastodon.svg", "core/img/mastodon-light.svg", "core/img/actions/mastodon.svg"] precedence = "aggregate" SPDX-FileCopyrightText = "2024 Mastodon gGmbH" SPDX-License-Identifier = "LicenseRef-MastodonTrademarks" diff --git a/core/img/bluesky-light.svg b/core/img/bluesky-light.svg new file mode 100644 index 0000000000000..5a38c07f8cb15 --- /dev/null +++ b/core/img/bluesky-light.svg @@ -0,0 +1 @@ + diff --git a/core/img/facebook-light.svg b/core/img/facebook-light.svg new file mode 100644 index 0000000000000..3ca9bed75df55 --- /dev/null +++ b/core/img/facebook-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/mastodon-light.svg b/core/img/mastodon-light.svg new file mode 100644 index 0000000000000..b275bd70684c8 --- /dev/null +++ b/core/img/mastodon-light.svg @@ -0,0 +1 @@ + \ No newline at end of file From 33cd89dbf8fba19e63cb97be3b7c02d6c2f935ed Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 25 Sep 2025 16:07:59 +0530 Subject: [PATCH 2/3] fix: added x dark and light images for x logo and switched images based on isDarkTheme flag Signed-off-by: yemkareems --- REUSE.toml | 2 +- core/img/x-dark.svg | 1 + core/img/x-light.svg | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 core/img/x-dark.svg create mode 100644 core/img/x-light.svg diff --git a/REUSE.toml b/REUSE.toml index f70638e3fd27f..fac413f03960a 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -328,7 +328,7 @@ SPDX-FileCopyrightText = "2016-2024 Collabora Ltd." SPDX-License-Identifier = "LicenseRef-CollaboraTrademarks" [[annotations]] -path = ["core/img/x.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"] +path = ["core/img/x.svg", "core/img/x-dark.svg", "core/img/x-light.svg", "core/img/twitter.svg", "core/img/actions/twitter.svg", "apps/federatedfilesharing/img/social-twitter.svg"] precedence = "aggregate" SPDX-FileCopyrightText = "X Corp." SPDX-License-Identifier = "LicenseRef-XTrademarks" diff --git a/core/img/x-dark.svg b/core/img/x-dark.svg new file mode 100644 index 0000000000000..b144d7821838a --- /dev/null +++ b/core/img/x-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/x-light.svg b/core/img/x-light.svg new file mode 100644 index 0000000000000..5c3d165d89275 --- /dev/null +++ b/core/img/x-light.svg @@ -0,0 +1 @@ + \ No newline at end of file From a3e8f00faa5d4ce48bf2d69db7865e3f74475b64 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 25 Sep 2025 19:59:31 +0530 Subject: [PATCH 3/3] fix: user settings page updated brand logos Signed-off-by: yemkareems --- .../settings/personal/development.notice.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/settings/templates/settings/personal/development.notice.php b/apps/settings/templates/settings/personal/development.notice.php index 233173304e30f..2856da7833a10 100644 --- a/apps/settings/templates/settings/personal/development.notice.php +++ b/apps/settings/templates/settings/personal/development.notice.php @@ -53,18 +53,18 @@ '{mailtext}', ], [ - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', + image_path('core', 'facebook-light.svg'), + image_path('core', 'x-dark.svg'), + image_path('core', 'bluesky-light.svg'), + image_path('core', 'mastodon-light.svg'), + image_path('core', 'rss.svg'), + image_path('core', 'mail.svg'), + '', + '', + '', + '', + '', + '', '', $l->t('Like our Facebook page'), $l->t('Follow us on X'), @@ -74,12 +74,12 @@ $l->t('Subscribe to our newsletter'), ], - '{facebookopen}{facebookimage}{linkclose} - {xopen}{ximage}{linkclose} - {blueskyopen}{blueskyimage}{linkclose} - {mastodonopen}{mastodonimage}{linkclose} - {rssopen}{rssimage}{linkclose} - {newsletteropen}{mailimage}{linkclose}' + '{facebookopen}{facebooktext}{linkclose} + {xopen}{xtext}{linkclose} + {blueskyopen}{blueskytext}{linkclose} + {mastodonopen}{mastodontext}{linkclose} + {rssopen}{rsstext}{linkclose} + {newsletteropen}{mailtext}{linkclose}' )); ?>