Merge branch 'disjointed-popovers' into shigusegubu-vue3

* disjointed-popovers:
  move media modal to the topmost layer
  optimization: only process resize/scroll events when popup is open
This commit is contained in:
Henry Jameson 2022-06-21 00:14:23 +03:00
commit 48bcc81fd0
2 changed files with 2 additions and 2 deletions

View file

@ -42,7 +42,7 @@
</div> </div>
<div id="notifs-column" class="column -scrollable" :class="{ '-show-scrollbar': showScrollbars }"/> <div id="notifs-column" class="column -scrollable" :class="{ '-show-scrollbar': showScrollbars }"/>
</div> </div>
<media-modal /> <MediaModal />
<shout-panel <shout-panel
v-if="currentUser && shout && !hideShoutbox" v-if="currentUser && shout && !hideShoutbox"
:floating="true" :floating="true"

View file

@ -121,7 +121,7 @@ $modal-view-button-icon-width: 3em;
$modal-view-button-icon-margin: 0.5em; $modal-view-button-icon-margin: 0.5em;
.modal-view.media-modal-view { .modal-view.media-modal-view {
z-index: 9000; z-index: 900000;
flex-direction: column; flex-direction: column;
.modal-view-button-arrow, .modal-view-button-arrow,