diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue index 9252d2fb..2d08a2a9 100644 --- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue +++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue @@ -317,7 +317,7 @@ {{ t('dialog.avatar.actions.create_impostor') }} - + {{ t('dialog.avatar.actions.delete') }} diff --git a/src/composables/useMainLayoutResizable.js b/src/composables/useMainLayoutResizable.js index 2d742727..7db3d3d1 100644 --- a/src/composables/useMainLayoutResizable.js +++ b/src/composables/useMainLayoutResizable.js @@ -111,12 +111,18 @@ export function useMainLayoutResizable() { if (!isSideBarTabShow.value) { return; } - const clampedAsidePx = clampAsidePx(asideWidth.value, width); - if (clampedAsidePx !== asideWidth.value) { + const maxAsidePx = getMaxAsidePx(width); + const clampedAsidePx = Math.min( + maxAsidePx, + Math.max(0, asideWidth.value) + ); + if (maxAsidePx > 0 && clampedAsidePx !== asideWidth.value) { setAsideWidth(clampedAsidePx); } const asideTargetSize = - clampedAsidePx > 0 ? pxToPercent(clampedAsidePx, width, 0) : 0; + maxAsidePx > 0 && clampedAsidePx > 0 + ? pxToPercent(clampedAsidePx, width, 0) + : 0; resizeAsidePanel(asideTargetSize); };