wip

incubateur-ademe · Oct 31, 2024 · d0de27a · d0de27a
1 parent 01d312e
commit d0de27a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/jinja2/qfdmo/_addresses_partials/filters/_modal.html b/jinja2/qfdmo/_addresses_partials/filters/_modal.html
@@ -1,16 +1,17 @@
 <div class='fr-container
             qfdmo-px-0
-            qfdmo-absolute qfdmo-z-[10010] qfdmo-top-auto qfdmo-hidden qfdmo-mt-auto qfdmo-h-[95vh]
+            qfdmo-fixed qfdmo-z-[10010] qfdmo-top-auto qfdmo-left-0 qfdmo-right-0 qfdmo-mt-auto
+            qfdmo-hidden
+            qfdmo-h-[90vh] qfdmo-h-[90svh] {# Keep both values help keep support for vh in firefox #}
             qfdmo-drop-shadow-[0_0_100px_rgba(0,0,0,0.5)]
             qfdmo-inset-0 qfdmo-font-black qfdmo-bg-white
             qfdmo-flex-col
             data-[visible=true]:qfdmo-animate-in
             data-[visible=true]:qfdmo-flex
-            data-[visible=true]:qfdmo-slide-in-from-bottom-9w
+            data-[visible=true]:qfdmo-slide-in-from-bottom-15w
             data-[visible=exit]:qfdmo-flex
             data-[visible=exit]:qfdmo-animate-out
-            data-[visible=exit]:qfdmo-slide-out-to-bottom-9w
-            data-[visible=exit]:qfdmo-fade-out
+            data-[visible=exit]:qfdmo-slide-out-to-bottom-full
            '
      data-visible="false"
      {% block wrapper_attrs %}

diff --git a/jinja2/qfdmo/carte/header.html b/jinja2/qfdmo/carte/header.html
@@ -3,7 +3,11 @@
 </div>
 
 {# Recherche adresse #}
-<div class="fr-my-1w qfdmo-flex-grow qfdmo-flex qfdmo-flex-col md:qfdmo-pl-3w md:qfdmo-pr-6w">
+<div class="fr-my-1w qfdmo-flex-grow qfdmo-flex qfdmo-flex-col
+    qfdmo-px-2w md:qfdmo-px-3w
+    md:qfdmo-pr-6w
+"
+>
     {% include 'qfdmo/_addresses_partials/adresse_input_form.html' %}
 
     <div class="lg:qfdmo-hidden fr-mt-1w qfdmo-flex qfdmo-justify-between">

diff --git a/jinja2/qfdmo/formulaire/header.html b/jinja2/qfdmo/formulaire/header.html
@@ -1,4 +1,4 @@
-<div>
+<div class="qfdmo-px-2w">
     {# Panel «Filtres avancés» #}
     {% include 'qfdmo/formulaire/advanced_filters.html' %}
 

diff --git a/jinja2/qfdmo/shared/_main.html b/jinja2/qfdmo/shared/_main.html
@@ -16,16 +16,15 @@
     ss-cat-object-autocomplete:formSubmit->search-solution-form#advancedSubmit"
     class="
     qfdmo-h-full
+    qfdmo-m-0
     qfdmo-flex qfdmo-flex-col qfdmo-flex-auto
-    qfdmo-relative
-    qfdmo-p-1v
-    "
+    qfdmo-relative"
     >
         <section class="map-grid">
             <header
                 class="
                 qfdmo-flex qfdmo-flex-row sm:qfdmo-items-center
-                max-md:qfdmo-sticky qfdmo-top-0 qfdmo-left-0 qfdmo-right-0 qfdmo-z-30"
+                max-md:qfdmo-sticky qfdmo-top-0 qfdmo-left-0 qfdmo-right-0 qfdmo-z-0"
             >
                 {% block content_header %}
                 {% endblock content_header %}
@@ -39,17 +38,16 @@
             They need to match the css variables used for .grid-map selector in qfdmo.css
             #}
             <main class="
-                {% if is_carte %}
-                qfdmo-h-[calc(100vh_-_120px)]
                 qfdmo-top-[120px]
+                {% if is_carte %}
+                max-md:qfdmo-h-[calc(100vh_-_120px)]
                 {% else %}
-                qfdmo-h-[calc(100vh_-_250px)]
-                qfdmo-top-[250px]
+                max-md:qfdmo-h-[calc(100vh_-_250px)]
                 {% endif %}
                 qfdmo-overflow-scroll
                 qfdmo-flex
                 max-md:qfdmo-sticky
-                qfdmo-z-40
+                qfdmo-z-0
                 ">
                 {% block result %}
                     <turbo-frame id="addressesPanel"
@@ -78,14 +76,13 @@
                 qfdmo-relative
                 qfdmo-z-50
                 qfdmo-flex qfdmo-flex-col
-                qfdmo-min-h-screen
+                max-md:qfdmo-min-h-screen
                 {% if is_carte %}
                 md:qfdmo-h-[calc(100vh_-_120px)]
                 {% else %}
                 md:qfdmo-h-[calc(100vh_-_250px)]
                 {% endif %}
                 max-md:snap-y md:qfdmo-overflow-scroll qfdmo-scroll-mt-[65vh]
-
                 qfdmo-bg-white
                 qfdmo-px-2w
                 md:qfdmo-w-[400px]