diff --git a/assets/controllers/drawer_controller.js b/assets/controllers/drawer_controller.js index 57cc9c2..33ba0e7 100644 --- a/assets/controllers/drawer_controller.js +++ b/assets/controllers/drawer_controller.js @@ -1,9 +1,9 @@ import { Controller } from '@hotwired/stimulus' /* - * The sidebar as a drawer on small screens: a modal (target "dialog"), so focus stays inside - * and Escape closes it. A click on the dimmed page beside it closes it too, and so does widening the - * window until the sidebar shows (lg). + * The navigation (sidebar or header tabs) as a drawer on small screens: a modal (target + * "dialog"), so focus stays inside and Escape closes it. A click on the dimmed page beside it closes it + * too, and so does widening the window until the navigation shows (lg). */ export default class extends Controller { static targets = ['dialog'] diff --git a/assets/styles/app.css b/assets/styles/app.css index 199b12f..2a10dd0 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -1,5 +1,5 @@ @import "tailwindcss"; -@import "toastify-js/src/toastify.css"; +@import "toastify-js/src/toastify.css" layer(base); @import "./ep-design.css"; @import "./_base.css" layer(base); @import "./_components.css" layer(components); diff --git a/assets/styles/ep-design.css b/assets/styles/ep-design.css index 6243a89..e68e3fc 100644 --- a/assets/styles/ep-design.css +++ b/assets/styles/ep-design.css @@ -5,7 +5,9 @@ * Status colours (green, red, amber) always come with text, never alone. * * Import after Tailwind: @import "tailwindcss"; @import "./ep-design.css"; @plugin "@tailwindcss/forms"; - * The toast styles expect toastify-js (@import "toastify-js/src/toastify.css" before this file). + * The toast styles expect toastify-js, imported into the base layer before this file: + * @import "toastify-js/src/toastify.css" layer(base); unlayered (or through its own ), its + * colours and gradient beat these layered styles whatever their specificity. */ /* @@ -245,7 +247,7 @@ @apply -rotate-135; } - /* the sidebar as a drawer from the left on small screens (drawer_controller.js) */ + /* the navigation (sidebar or header tabs) as a drawer from the left on small screens (drawer_controller.js) */ dialog.drawer { @apply m-0 h-dvh max-h-none w-80 max-w-[calc(100vw-4rem)] bg-page p-0; } diff --git a/templates/components/menu.html.twig b/templates/components/menu.html.twig index 0efb4ff..1a8a6fe 100644 --- a/templates/components/menu.html.twig +++ b/templates/components/menu.html.twig @@ -7,7 +7,7 @@
-