From f36353e010a12b8ab5a0e50a22fd13bd8db8daed Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 11 Nov 2024 15:42:42 +0000 Subject: [PATCH] New option to disable SVG icons / Functionality added to Vier --- src/Content/ContactSelector.php | 5 +++++ src/Module/Settings/Display.php | 1 + view/templates/wall_thread.tpl | 8 ++++++-- view/theme/vier/style.css | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 6f5b73bf6b..5a00feeaf6 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -18,6 +18,7 @@ use Friendica\Util\Strings; */ class ContactSelector { + const SVG_DISABLED = -1; const SVG_COLOR_BLACK = 0; const SVG_BLACK = 1; const SVG_COLOR_WHITE = 2; @@ -183,6 +184,10 @@ class ContactSelector { $platform_icon_style = $uid ? (DI::pConfig()->get($uid, 'accessibility', 'platform_icon_style') ?? self::SVG_COLOR_BLACK) : self::SVG_COLOR_BLACK; + if ($platform_icon_style == self::SVG_DISABLED) { + return ''; + } + $nets = [ Protocol::ACTIVITYPUB => 'activitypub', // https://commons.wikimedia.org/wiki/File:ActivityPub-logo-symbol.svg Protocol::BLUESKY => 'bluesky', // https://commons.wikimedia.org/wiki/File:Bluesky_Logo.svg diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 3c71b604d6..71e22c5fd2 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -253,6 +253,7 @@ class Display extends BaseSettings $hide_custom_emojis = $this->pConfig->get($uid, 'accessibility', 'hide_custom_emojis', false); $platform_icon_style = $this->pConfig->get($uid, 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_BLACK); $platform_icon_styles = [ + ContactSelector::SVG_DISABLED => $this->t('Disabled'), ContactSelector::SVG_COLOR_BLACK => $this->t('Color/Black'), ContactSelector::SVG_BLACK => $this->t('Black'), ContactSelector::SVG_COLOR_WHITE => $this->t('Color/White'), diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index 90cc69d25e..4933614fba 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -71,9 +71,13 @@ {{/if}} {{$item.pinned}} - {{if $item.lock}}{{$item.lock}}{{/if}} - + {{if $item.lock}}{{$item.lock}}{{/if}} + + {{if $item.network_svg}} + {{$item.network_name}} + {{else}} {{$item.network_name}} + {{/if}}
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 149ebe6b69..8a9d9722d6 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1779,6 +1779,13 @@ section.minimal { padding-right: 12px; */ } +.network-svg { + width: 18px; + height: 18px; + border-radius: 4px; + padding: 2px; +} + #profile-jot-form { box-shadow: 1px 2px 0px 0px #D8D8D8; background-color: #fafafa;