Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers: don't stop propagation on settings modal open proper horizontal limit don't use async component for user popover to fix the incorrect initial position. for some reason same doesn't work with status popover...
This commit is contained in:
commit
559886d844
3 changed files with 4 additions and 3 deletions
|
@ -38,7 +38,7 @@
|
|||
/>
|
||||
<button
|
||||
class="button-unstyled nav-icon"
|
||||
@click.stop="openSettingsModal"
|
||||
@click="openSettingsModal"
|
||||
>
|
||||
<FAIcon
|
||||
fixed-width
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
z-index: 90000;
|
||||
position: fixed;
|
||||
min-width: 0;
|
||||
max-width: 90vw;
|
||||
max-width: calc(100vw - 20px);
|
||||
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: var(--popupShadow);
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
import UserCard from '../user_card/user_card.vue'
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
|
||||
const UserPopover = {
|
||||
|
@ -6,7 +7,7 @@ const UserPopover = {
|
|||
'userId', 'overlayCenters', 'disabled'
|
||||
],
|
||||
components: {
|
||||
UserCard: defineAsyncComponent(() => import('../user_card/user_card.vue')),
|
||||
UserCard,
|
||||
Popover: defineAsyncComponent(() => import('../popover/popover.vue'))
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue