Skip to content

Commit 0b97e4f

Browse files
committed
fix(core): app menu launcher tile icon, dark mode, and hyphenation
-e Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
1 parent 0a48a28 commit 0b97e4f

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

core/src/components/AppItem.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ const unreadLabel = computed(() => {
149149
line-height: 1.3;
150150
text-align: center;
151151
color: var(--color-main-text);
152+
// Needs a matching <html lang> to actually break with a hyphen.
153+
-webkit-hyphens: auto;
154+
hyphens: auto;
152155
word-break: normal;
153156
overflow-wrap: break-word;
154157
max-width: 100%;
@@ -159,15 +162,15 @@ const unreadLabel = computed(() => {
159162
font-weight: bold;
160163
}
161164
162-
// Outlined variant: no fill or gradient; icon color is unforced.
165+
// Outlined variant: no fill or gradient.
163166
&--outlined &__circle {
164167
background: transparent;
165168
background-image: none;
166169
box-shadow: inset 0 0 0 2px var(--color-border-maxcontrast);
167170
}
168171
169172
&--outlined &__icon {
170-
filter: brightness(0);
173+
filter: var(--background-invert-if-dark);
171174
mask: none;
172175
}
173176
}

core/src/components/AppMenu.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import { getCurrentUser } from '@nextcloud/auth'
7474
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
7575
import { loadState } from '@nextcloud/initial-state'
7676
import { isRTL, n, t } from '@nextcloud/l10n'
77-
import { generateFilePath, generateUrl } from '@nextcloud/router'
77+
import { generateUrl, imagePath } from '@nextcloud/router'
7878
import { defineComponent, ref } from 'vue'
7979
import NcButton from '@nextcloud/vue/components/NcButton'
8080
import NcPopover from '@nextcloud/vue/components/NcPopover'
@@ -120,7 +120,7 @@ export default defineComponent({
120120
active: false,
121121
order: Number.MAX_SAFE_INTEGER,
122122
href: generateUrl('/settings/apps'),
123-
icon: generateFilePath('settings', 'img', 'settings_apps.svg'),
123+
icon: imagePath('core', 'actions/add.svg'),
124124
type: 'link',
125125
name: t('core', 'More apps'),
126126
unread: 0,
@@ -131,7 +131,7 @@ export default defineComponent({
131131
active: false,
132132
order: Number.MAX_SAFE_INTEGER,
133133
href: 'https://apps.nextcloud.com/',
134-
icon: generateFilePath('settings', 'img', 'apps.svg'),
134+
icon: imagePath('core', 'actions/add.svg'),
135135
type: 'link',
136136
name: t('core', 'App store'),
137137
unread: 0,

0 commit comments

Comments
 (0)