Skip to content

Commit 352d0cc

Browse files
committed
fix: settings icon
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
1 parent 0a36e6a commit 352d0cc

4 files changed

Lines changed: 16 additions & 5 deletions

File tree

core/src/components/AppMenu.vue

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<img
5858
class="app-menu__current-app-icon"
5959
:class="{ 'app-menu__current-app-icon--settings': currentApp.type === 'settings' }"
60-
:src="currentApp.icon"
60+
:src="displayIcon"
6161
alt=""
6262
aria-hidden="true">
6363
</template>
@@ -172,6 +172,17 @@ export default defineComponent({
172172
: this.currentApp.name
173173
},
174174
175+
// Match the collapsed label: a generic cog for any settings
176+
// sub-section instead of the per-section icon.
177+
displayIcon(): string {
178+
if (!this.currentApp) {
179+
return ''
180+
}
181+
return this.currentApp.type === 'settings'
182+
? imagePath('core', 'actions/settings.svg')
183+
: this.currentApp.icon
184+
},
185+
175186
// aria-label overrides the inner span text, so the displayed name
176187
// has to be duplicated here for screen readers.
177188
currentAppLabel(): string {

dist/core-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ This file is generated from multiple sources. Included packages:
209209
- version: 11.3.0
210210
- license: MIT
211211
- axios
212-
- version: 1.16.1
212+
- version: 1.15.0
213213
- license: MIT
214214
- base64-js
215215
- version: 1.5.1

dist/core-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)