Merge branch 'develop' into release

This commit is contained in:
SabreCat
2022-04-29 14:22:07 -05:00
5 changed files with 8 additions and 6 deletions
@@ -159,7 +159,7 @@
<toggle-switch
v-model="filterBackgrounds"
class="backgroundFilterToggle"
:label="'Hide locked backgrounds'"
:label="$t('hideLockedBackgrounds')"
/>
</div>
<div
@@ -247,6 +247,7 @@
</div>
</div>
<sub-menu
v-if="!filterBackgrounds"
class="text-center"
:items="bgSubMenuItems"
:active-sub-page="activeSubPage"