From 5e8a3eb66c312e46e35824ada4bb4e4642279912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Thu, 28 Apr 2022 11:30:36 +0200
Subject: Fix header apps icons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 core/css/header.scss           | 9 +++------
 core/templates/layout.user.php | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/css/header.scss b/core/css/header.scss
index 2e53571a806..a5a706ae239 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -182,7 +182,7 @@
 		left: 12px;
 		top: 1px;
 		bottom: 1px;
-		// Invert custom logo if primary too bright
+		// Invert non-custom logo if primary is too bright
 		filter: var(--image-logoheader-custom, var(--primary-invert-if-bright))
 	}
 
@@ -446,11 +446,6 @@ nav[role='navigation'] {
 			// Make sure most app names don’t ellipsize
 			letter-spacing: -0.5px;
 			font-size: 12px;
-
-			// If the primary is too bright, invert the app icons
-			svg image {
-				filter: var(--primary-invert-if-bright);
-			}
 		}
 
 		/* focused app visual feedback */
@@ -508,6 +503,8 @@ nav[role='navigation'] {
 		svg,
 		.icon-more-white {
 			transition: transform var(--animation-quick) ease;
+			// If the primary is too bright, invert the app icons
+			filter: var(--primary-invert-if-bright);
 		}
 
 		/* Triangle */
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4efe072a5bb..40fd13a1000 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -109,7 +109,7 @@ $getUserAvatar = static function (int $size) use ($_): string {
 										<?php if (isset($entry['target']) && $entry['target']): ?> target="_blank" rel="noreferrer noopener"<?php endif; ?>
 										<?php if ($entry['active']): ?> class="active"<?php endif; ?>
 										aria-label="<?php p($entry['name']); ?>">
-										<svg width="20" height="20" viewBox="0 0 20 20" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
+										<svg width="20" height="20" viewBox="0 0 16 16" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
 											<defs>
 												<filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter>
 												<mask id="hole">
-- 
cgit v1.2.3