Skip to content

[6.x] Remove global header z index #13314

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

Merged
jasonvarga merged 3 commits into from
Dec 11, 2025
+9 −10
Merged

[6.x] Remove global header z index #13314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22701b4
Replace `z-index-global-header` instances with `z-index-above`, which…
JayGeorge Dec 10, 2025
3d3c135
Re-calculate z-index stack
JayGeorge Dec 10, 2025
6a3075c
Prevent field popovers appearing above the global header
JayGeorge Dec 11, 2025
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
9 changes: 4 additions & 5 deletions resources/css/elements/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@

--z-index-below: -1;
--z-index-above: 1;
--z-index-global-header: 2;
--z-index-portal: 3;
--z-index-draggable: 4;
--z-index-modal: 5;
--z-index-max: 6;
--z-index-portal: 2;
--z-index-draggable: 3;
--z-index-modal: 4;
--z-index-max: 5;

/* Used for entry animations */
--starting-style-transition-duration: 0.125s;
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
:is-fullscreen="false"
@toggle-dark-mode="toggleDarkMode"
@button-click="handleButtonClick"
class="sticky z-(--z-index-global-header) -top-2 mb-2 [&~*]:-mt-2"
class="sticky z-(--z-index-above) -top-2 mb-2 [&~*]:-mt-2"
/>

<div class="drag-notification" v-show="dragging">
Expand Down Expand Up @@ -96,7 +96,7 @@
<!-- Hidden input for label association -->
<input v-if="id" :id="id" type="text" class="sr-only" @focus="focusCodeMirror" tabindex="-1" />

<footer class="flex items-center justify-between bg-gray-50 dark:bg-gray-900 rounded-b-[calc(var(--radius-lg)-1px)] border-t border-gray-300 dark:border-white/10 p-1 text-sm w-full" :class="{ 'absolute inset-x-0 bottom-0 rounded-none z-(--z-index-global-header)': fullScreenMode }">
<footer class="flex items-center justify-between bg-gray-50 dark:bg-gray-900 rounded-b-[calc(var(--radius-lg)-1px)] border-t border-gray-300 dark:border-white/10 p-1 text-sm w-full" :class="{ 'absolute inset-x-0 bottom-0 rounded-none z-(--z-index-above)': fullScreenMode }">
<div class="markdown-cheatsheet-helper">
<Button
icon="markdown"
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/global-header/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import UserDropdown from './UserDropdown.vue';
</script>

<template>
<header class="h-14 bg-global-header-bg flex justify-between space-x-2 items-center text-white px-2 lg:px-4 fixed overflow-x-auto top-0 inset-x-0 z-(--z-index-global-header)">
<a class="c-skip-link z-(--z-index-global-header) px-4 py-2 bg-blue-800 text-sm top-2.5 left-2.25 fixed opacity-0 -translate-y-24 focus:translate-y-0 focus:opacity-100 rounded-md" href="#main">
<header class="h-14 bg-global-header-bg flex justify-between space-x-2 items-center text-white px-2 lg:px-4 fixed overflow-x-auto top-0 inset-x-0 z-(--z-index-above)">
<a class="c-skip-link z-(--z-index-above) px-4 py-2 bg-blue-800 text-sm top-2.5 left-2.25 fixed opacity-0 -translate-y-24 focus:translate-y-0 focus:opacity-100 rounded-md" href="#main">
{{ __('Skip to sidebar') }}
</a>
<a class="c-skip-link z-(--z-index-global-header) px-4 py-2 bg-blue-800 text-sm top-2.5 left-2.25 fixed opacity-0 -translate-y-24 focus:translate-y-0 focus:opacity-100 rounded-md" href="#main-content">
<a class="c-skip-link z-(--z-index-above) px-4 py-2 bg-blue-800 text-sm top-2.5 left-2.25 fixed opacity-0 -translate-y-24 focus:translate-y-0 focus:opacity-100 rounded-md" href="#main-content">
{{ __('Skip to content') }}
</a>
<div class="dark flex items-center gap-2 text-[0.8125rem] text-white/85 w-full">
Expand Down