Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.x] Customize Columns Modal Height Thrashing #9538

Merged
merged 6 commits into from
Feb 20, 2024
Merged

[4.x] Customize Columns Modal Height Thrashing #9538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ef2e3b
Prevent height thrashing when modal contents overflow
JohnathonKoster Feb 17, 2024
fa6b5ab
move to a utility
jasonvarga Feb 20, 2024
ce8c1ee
use it
jasonvarga Feb 20, 2024
a6cbff5
revert indentation and use utility
jasonvarga Feb 20, 2024
9eadb36
here too
jasonvarga Feb 20, 2024
5a4a625
rename
jasonvarga Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions resources/css/core/utilities.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@
[x-cloak] {
display: none
}

.-max-h-screen-px {
max-height: calc(100vh - 1px) !important;
}
2 changes: 2 additions & 0 deletions resources/js/components/SessionExpiry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<button v-if="isWarning" class="session-expiry-stripe" @click="extend" v-text="warningText" />

<modal name="session-timeout-login" v-if="isShowingLogin" height="auto" width="500px" :adaptive="true">
<div class="-max-h-screen-px">
<div class="flex items-center p-6 bg-gray-200 border-b text-center">
{{ __('Resume Your Session') }}
</div>
Expand Down Expand Up @@ -42,6 +43,7 @@
</div>
</div>
</div>
</div>
</modal>

</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/data-list/ColumnPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</button>

<modal v-if="open" name="column-picker" @closed="open = false" draggable=".modal-drag-handle" click-to-close>
<div class="flex flex-col h-full">
<div class="flex flex-col h-full -max-h-screen-px">

<header class="modal-drag-handle p-4 bg-gray-200 border-b flex items-center justify-between cursor-grab active:cursor-grabbing">
<h2>{{ __('Customize Columns') }}</h2>
Expand Down
2 changes: 2 additions & 0 deletions resources/js/components/modals/KeyboardShortcutsModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<modal v-if="open" name="keyboard-shortcuts" width="380" height="auto" :adaptive="true" @closed="open = false" click-to-close>
<div class="-max-h-screen-px">
<h1 class="p-4 bg-gray-200 border-b text-center">
{{ __('Keyboard Shortcuts') }}
</h1>
Expand Down Expand Up @@ -47,6 +48,7 @@
<span class="shortcut-value">{{ __('Close Modal') }}</span>
</div>
</div>
</div>
</modal>
</template>

Expand Down
Loading