Skip to content

😶‍🌫️ Totalement masquer la légende en mobile #1558

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
merged 4 commits into from
Apr 24, 2025
Merged

😶‍🌫️ Totalement masquer la légende en mobile #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eaed183
Fully hide legend on mobile
fabienheureux Apr 24, 2025
32166c2
Fix legend
fabienheureux Apr 24, 2025
05d43cc
wip
fabienheureux Apr 24, 2025
d20a77d
wip
fabienheureux Apr 24, 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
4 changes: 2 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"filename": "jinja2/layout/base.html",
"hashed_secret": "057dece35d736a3ae1e710a9cba3f080bd101cde",
"is_verified": false,
"line_number": 62
"line_number": 65
}
],
"unit_tests/qfdmo/test_views.py": [
Expand All @@ -191,5 +191,5 @@
}
]
},
"generated_at": "2025-04-23T10:12:59Z"
"generated_at": "2025-04-24T11:22:55Z"
}
3 changes: 3 additions & 0 deletions jinja2/layout/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
lang="fr"
class="qf-scroll-smooth"
{% if not is_carte %}data-formulaire{% endif %}
{% if carte_config and carte_config.hide_legend %}
data-legend-hidden
{% endif %}
>
<head>
<meta charset="utf-8">
Expand Down
4 changes: 2 additions & 2 deletions jinja2/qfdmo/carte/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
>
{% include 'qfdmo/_addresses_partials/adresse_input_form.html' %}

{% if not carte_config or not carte_config.hide_legend %}
<div class="lg:qf-hidden fr-mt-1w qf-flex qf-justify-between">
<button
class="fr-btn fr-btn--sm fr-btn--tertiary"
Expand All @@ -26,7 +27,6 @@
</button>
<div class="qf-flex qf-flex-row-reverse">
{% if form.legend_grouped_action|length > 1 %}
{% if carte_config and not carte_config.hide_legend %}
<button
class="fr-btn fr-btn--sm fr-btn--secondary fr-ml-1w fr-btn--icon-left fr-icon-eye-line"
type="button"
Expand All @@ -36,7 +36,6 @@
Légende
</button>
{% endif %}
{% endif %}
<button
class="fr-btn fr-btn--sm fr-btn--secondary fr-ml-1w fr-btn--icon-left fr-icon-equalizer-line"
type="button"
Expand All @@ -47,4 +46,5 @@
</button>
</div>
</div>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion jinja2/qfdmo/carte/panels/legend.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% if carte_config and not carte_config.hide_legend %}
{% if not carte_config or not carte_config.hide_legend %}
<aside
data-testid="carte-legend"
class="
Expand Down
15 changes: 9 additions & 6 deletions static/to_compile/entrypoints/qfdmo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@tailwind components;
@tailwind utilities;


pre {
font-family: Marianne, arial, sans-serif;
font-weight: 500;
Expand Down Expand Up @@ -86,12 +85,16 @@ Style the autocomplete container:
}

:root {
--footer-height: 0;
--sidebar-width: 0;
--header-height: 120px;
--footer-height: 0;
--sidebar-width: 0;
--header-height: 120px;
}

:root[data-legend-hidden] {
--header-height: 0;
}

:root[data-formulaire] {
--footer-height: 100px;
--header-height: 135px;
--footer-height: 100px;
--header-height: 135px;
}
Loading