Merge branch 'fix-bookrmarkdropdown' into shigusegubu-themes3

This commit is contained in:
Henry Jameson 2025-03-27 16:21:45 +02:00
commit efe8dbf921
4 changed files with 9 additions and 92 deletions

View file

@ -24,7 +24,7 @@
:style="{ '--fa-animation-duration': '750ms' }"
fixed-width
/>
<template v-if="!buttonClass.disabled && button.toggleable?.(funcArg) && button.active">
<template v-if="!buttonClass.disabled && (!button.interactive || button?.interactive(funcArg)) && button.toggleable?.(funcArg) && button.active">
<FAIcon
v-if="button.active(funcArg)"
class="active-marker"

View file

@ -15,9 +15,16 @@
:class="{ 'menu-checkbox-checked': status.bookmark_folder_id == folder.id }"
/>
<StillImage
v-if="folder.emoji_url"
:src="folder.emoji_url"
class="emoji"
/>
<span
v-else
class="iconLetter fa-scale-110 fa-old-padding"
>
{{ folder.name[0] }}
</span>
{{ ' ' + folder.name }}
</button>
</div>