diff --git a/public/styles/table.css b/public/styles/table.css index f03a1f5..242e973 100644 --- a/public/styles/table.css +++ b/public/styles/table.css @@ -1,6 +1,6 @@ table { width: 100%; - text-align: center; + text-align: left; border-collapse: collapse; } @@ -9,6 +9,10 @@ color: var(--secondary); font-weight: bold; font-size: 1.5rem; + padding-left: 1rem; + padding-right: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; } tbody tr:nth-child(even) { @@ -20,8 +24,11 @@ } tbody td { - padding: 0.25rem; color: var(--dark); font-weight: bold; font-size: 1rem; + padding-left: 1rem; + padding-right: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; } \ No newline at end of file diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig index bd72b95..318fb7f 100644 --- a/templates/_includes/html/arrays/activity.html.twig +++ b/templates/_includes/html/arrays/activity.html.twig @@ -10,11 +10,11 @@ {% if not hideActor %} Acteur {% endif %} - Début planifié - Fin planifiée - Début réél - Fin réele - Actions + Début planifié + Fin planifiée + Début réél + Fin réele + Actions @@ -28,19 +28,19 @@ {% endif %} {% endif %} - {% if activity.startDate is not null %} {{ dateTools.euro(activity.startDate) }} + {% if activity.startDate is not null %} {{ dateTools.euro(activity.startDate) }} {% endif %} - {% if activity.endDate is not null %} {{ dateTools.euro(activity.endDate) }} + {% if activity.endDate is not null %} {{ dateTools.euro(activity.endDate) }} {% endif %} - {% if activity.realStartDate is not null %} {{ dateTools.euro(activity.realStartDate) }} + {% if activity.realStartDate is not null %} {{ dateTools.euro(activity.realStartDate) }} {% endif %} - {% if activity.realEndDate is not null %} {{ dateTools.euro(activity.realEndDate) }} + {% if activity.realEndDate is not null %} {{ dateTools.euro(activity.realEndDate) }} {% endif %} - Editer - {% if activityDeleteForm is defined %} {% include '_includes/html/genericForm.html.twig' with {'form': activityDeleteForm, 'data': {activity: activity, variant: 'icon'}} only %} + {% if activityDeleteForm is defined %} {% include '_includes/html/genericForm.html.twig' with {'form': activityDeleteForm, 'data': {activity: activity, variant: 'icon'}} only %} {% endif %} {% endfor %} diff --git a/templates/_includes/html/arrays/actor.html.twig b/templates/_includes/html/arrays/actor.html.twig index a6483b6..19108cb 100644 --- a/templates/_includes/html/arrays/actor.html.twig +++ b/templates/_includes/html/arrays/actor.html.twig @@ -4,9 +4,9 @@ Nom Prénom Surnom - Suivi - Actif - Actions + Suivi + Actif + Actions @@ -15,14 +15,14 @@ {{ actor.firstName }} {{ actor.lastName }} {{ actor.nickname }} - {% if actor.followed %}{% if actor.followed %}Suivi {% endif %} - {% if actor.active %}{% if actor.active %}Actif {% endif %} - Editer - {% if actorDeleteForm is defined %} {% include '_includes/html/genericForm.html.twig' with {'form': actorDeleteForm, 'data': {actor: actor, variant: 'icon'}} only %} + {% if actorDeleteForm is defined %} {% include '_includes/html/genericForm.html.twig' with {'form': actorDeleteForm, 'data': {actor: actor, variant: 'icon'}} only %} {% endif %} {% endfor %}