Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2022-04-28 20:30:59 +0300
committerGitHub <noreply@github.com>2022-04-28 20:30:59 +0300
commit350d0261eaa2c78832d6666bd154de1cbf35fe8a (patch)
tree4dac2d4b81523a085e4296f2cbeeb9c1994f8f79 /core
parentf72f81158d824512dcd0dd4e06484e06fdb21d6d (diff)
parent5e8a3eb66c312e46e35824ada4bb4e4642279912 (diff)
Merge pull request #32204 from nextcloud/fix/invert-logo
Diffstat (limited to 'core')
-rw-r--r--core/css/header.scss15
-rw-r--r--core/templates/layout.user.php2
2 files changed, 5 insertions, 12 deletions
diff --git a/core/css/header.scss b/core/css/header.scss
index 4c107c0d58f..a5a706ae239 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -182,12 +182,8 @@
left: 12px;
top: 1px;
bottom: 1px;
-
- img {
- opacity: 0;
- max-width: 100%;
- max-height: 200px;
- }
+ // Invert non-custom logo if primary is too bright
+ filter: var(--image-logoheader-custom, var(--primary-invert-if-bright))
}
.header-appname-container {
@@ -450,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 */
@@ -512,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">