Skip to content

Commit

Permalink
fix: ajout des marges manquante en bas de page (#1439)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SebastienReuiller
SebastienReuiller authored Sep 25, 2024
1 parent 5a258a3 commit e2c4783
Show file tree
Hide file tree
Showing 9 changed files with 613 additions and 541 deletions.
20 changes: 17 additions & 3 deletions lemarche/static/itou_marche/itou_marche.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ $yellow-super-badge--borders-color: #fcc63a;
position: relative;
flex-direction: column;
}

.fr-input {
width: 100%;
}

.fr-btn {
margin-left: 8px;
}

.fr-checkbox-list {
position: relative;
top: 100%;
Expand All @@ -36,14 +39,17 @@ $yellow-super-badge--borders-color: #fcc63a;
padding: 8px;
display: none;
}

.fr-checkbox-list.show {
display: block;
}

.fr-tags-group {
display: flex;
flex-wrap: wrap;
margin-top: 8px;
}

.fr-tag {
margin: 4px;
background-color: #e5e5e5;
Expand All @@ -52,6 +58,7 @@ $yellow-super-badge--borders-color: #fcc63a;
display: flex;
align-items: center;
}

.fr-tag .fr-tag__close {
margin-left: 8px;
cursor: pointer;
Expand Down Expand Up @@ -144,7 +151,14 @@ ul.summary-grid-list {
}

.cmsfr-background-dark {
& h1, p {

& h1,
h2,
h3,
h4,
h5,
h6,
p {
color: white;
}
}
Expand All @@ -166,5 +180,5 @@ ul.summary-grid-list {
}

.fr-content-media {
margin: 0;
}
margin: 0;
}
143 changes: 64 additions & 79 deletions lemarche/templates/dashboard/home_buyer.html
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,86 @@
{% extends "layouts/base.html" %}
{% load static get_verbose_name process_dict dsfr_tags %}

{% block page_title %}{{ DASHBOARD_TITLE }}{{ block.super }}{% endblock page_title %}

{% block page_title %}
{{ DASHBOARD_TITLE }}{{ block.super }}
{% endblock page_title %}
{% block breadcrumb %}
{% process_dict root_dir=HOME_PAGE_PATH current=DASHBOARD_TITLE as breadcrumb_data %}
{% dsfr_breadcrumb breadcrumb_data %}
{% endblock breadcrumb %}

{% block content %}
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12">
<h1>{{ DASHBOARD_TITLE }}</h1>
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12">
<h1>{{ DASHBOARD_TITLE }}</h1>
</div>
</div>
</div>
</div>

<div class="fr-container">
<div class="fr-grid-row fr-grid-row--gutters fr-mb-4v">
<div class="fr-col-12 fr-col-lg-7">
{% if user.tenders.count %}
<div class="fr-card">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title">
Mes besoins
</h3>
<div class="fr-card__desc">
<p class="fr-mb-8v">
<a href="{% url 'tenders:create' %}" id="dashboard-tender-create-btn" class="fr-btn fr-btn--icon-right fr-icon-add-circle-line">
Publier un besoin d'achat
</a>
</p>
{% for tender in last_3_tenders %}
<div class="fr-grid-row{% if not forloop.last %} fr-mb-8v{% endif %}">
<div class="fr-col-12">
{% include "tenders/_card_list_item.html" with tender=tender %}
<div class="fr-container fr-mb-6w">
<div class="fr-grid-row fr-grid-row--gutters fr-mb-4v">
<div class="fr-col-12 fr-col-lg-7">
{% if user.tenders.count %}
<div class="fr-card">
<div class="fr-card__body">
<div class="fr-card__content">
<h3 class="fr-card__title">Mes besoins</h3>
<div class="fr-card__desc">
<p class="fr-mb-8v">
<a href="{% url 'tenders:create' %}"
id="dashboard-tender-create-btn"
class="fr-btn fr-btn--icon-right fr-icon-add-circle-line">
Publier un besoin d'achat
</a>
</p>
{% for tender in last_3_tenders %}
<div class="fr-grid-row{% if not forloop.last %} fr-mb-8v{% endif %}">
<div class="fr-col-12">{% include "tenders/_card_list_item.html" with tender=tender %}</div>
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
<div class="fr-card__footer">
<ul class="fr-btns-group fr-btns-group--icon-right fr-btns-group--right fr-btns-group--inline">
<li>
<a class="fr-btn fr-icon-arrow-right-s-line fr-btn--tertiary-no-outline"
href="{% url 'tenders:list' %}">Accéder à mes besoins</a>
</li>
</ul>
</div>
</div>
<div class="fr-card__footer">
<ul class="fr-btns-group fr-btns-group--icon-right fr-btns-group--right fr-btns-group--inline">
<li>
<a class="fr-btn fr-icon-arrow-right-s-line fr-btn--tertiary-no-outline" href="{% url 'tenders:list' %}">
Accéder à mes besoins
</a>
</li>
</ul>
</div>
</div>
{% else %}
{% include "dashboard/_add_tender_card.html" %}
{% endif %}
</div>
<div class="fr-col-12 fr-col-lg-5">
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
{% include "dashboard/_stats_card.html" with user_buyer_count=user_buyer_count siae_count=siae_count tender_count=tender_count %}
</div>
{% if not user.partner_network %}
<div class="fr-col-12">{% include "dashboard/_impact_calculator_card.html" %}</div>
{% else %}
<div class="fr-col-12">{% include "dashboard/_network_card.html" with network=user.partner_network %}</div>
{% endif %}
</div>
{% else %}
{% include "dashboard/_add_tender_card.html" %}
{% endif %}
</div>
<div class="fr-col-12 fr-col-lg-5">
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
{% include "dashboard/_stats_card.html" with user_buyer_count=user_buyer_count siae_count=siae_count tender_count=tender_count %}
</div>
{% if not user.partner_network %}
<div class="fr-col-12">
{% include "dashboard/_impact_calculator_card.html" %}
</div>
{% else %}
<div class="fr-col-12">
{% include "dashboard/_network_card.html" with network=user.partner_network %}
</div>
{% endif %}
</div>
</div>
</div>
<div class="fr-grid-row fr-grid-row--gutters fr-mb-4v">
<div class="fr-col-12 fr-col-lg-5">
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
{% include "dashboard/_facilitator_list_card.html" %}
</div>
<div class="fr-col-12">
{% include "dashboard/_valoriser_achats_card.html" %}
<div class="fr-grid-row fr-grid-row--gutters fr-mb-4v">
<div class="fr-col-12 fr-col-lg-5">
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">{% include "dashboard/_facilitator_list_card.html" %}</div>
<div class="fr-col-12">{% include "dashboard/_valoriser_achats_card.html" %}</div>
</div>
</div>
<div class="fr-col-12 fr-col-lg-7">
{% include "dashboard/_ressource_card.html" with user_kind="BUYER" ressources=last_3_ressources category_slug=category_slug_cat %}
</div>
</div>
<div class="fr-col-12 fr-col-lg-7">
{% include "dashboard/_ressource_card.html" with user_kind="BUYER" ressources=last_3_ressources category_slug=category_slug_cat %}
</div>
</div>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-lg-6">
{% include "dashboard/_favorites_card.html" %}
</div>
<div class="fr-col-12 fr-col-lg-6">
{% include "dashboard/_api_key_card.html" with api_key=user.api_key user_kind="BUYER" %}
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-lg-6">{% include "dashboard/_favorites_card.html" %}</div>
<div class="fr-col-12 fr-col-lg-6">
{% include "dashboard/_api_key_card.html" with api_key=user.api_key user_kind="BUYER" %}
</div>
</div>
</div>
</div>
{% endblock content %}
Loading

0 comments on commit e2c4783

Please sign in to comment.