From 8a3e10a1f711b341c6cbda13da3f1abab7741d4b Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 26 Jun 2023 11:47:20 +0200
Subject: [PATCH] amelioration(design): ETQ usager la cohabitation du design
 d'un form mi-DSFR, mi-DS n'est pas trop moche

amelioration(design): ETQ usager la cohabitation du design d'un form mi-DSFR, mi-DS n'est pas trop moche
---
 app/assets/stylesheets/forms.scss   |  3 +--
 spec/system/users/brouillon_spec.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index 4c6edc45e5c..02da466d6ea 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -196,7 +196,7 @@
   .fr-label {
     // la description d'un champ peut contenir du markup (markdown->html),
     // on herite donc la fontsize/mrgin/padding du fr-hint-text
-    .fr-hint-text > *{
+    .fr-hint-text > * {
       font-size: inherit;
       margin: inherit;
       padding: inherit;
@@ -206,7 +206,6 @@
   input[type=password],
   select {
     display: block;
-    margin-bottom: $default-fields-spacer;
     margin-bottom: 0;
 
     &.small-margin {
diff --git a/spec/system/users/brouillon_spec.rb b/spec/system/users/brouillon_spec.rb
index bdddc6797a5..1734a32f9d7 100644
--- a/spec/system/users/brouillon_spec.rb
+++ b/spec/system/users/brouillon_spec.rb
@@ -419,7 +419,7 @@
       let(:procedure) do
         create(:procedure, :published, :for_individual,
           types_de_champ_public: [
-            { type: :integer_number, libelle: 'age', stable_id: age_stable_id },
+            { type: :integer_number, libelle: 'age du candidat', stable_id: age_stable_id },
             { type: :yes_no, libelle: 'permis de conduire', stable_id: permis_stable_id, condition: permis_condition },
             { type: :header_section, libelle: 'info voiture', condition: permis_condition },
             { type: :integer_number, libelle: 'tonnage', stable_id: tonnage_stable_id, condition: tonnage_condition },
@@ -432,12 +432,12 @@
 
         fill_individual
 
-        expect(page).to have_css('label', text: 'age', visible: true)
+        expect(page).to have_css('label', text: 'age du candidat', visible: true)
         expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
         expect(page).to have_no_css('legend h2', text: 'info voiture', visible: true)
         expect(page).to have_no_css('label', text: 'tonnage', visible: true)
 
-        fill_in('age (facultatif)', with: '18')
+        fill_in('age du candidat (facultatif)', with: '18')
         expect(page).to have_css('label', text: 'permis de conduire', visible: true)
         expect(page).to have_css('legend h2', text: 'info voiture', visible: true)
         expect(page).to have_no_css('label', text: 'tonnage', visible: true)
@@ -453,7 +453,7 @@
         fill_in('tonnage (facultatif)', with: 'a')
         expect(page).to have_no_css('label', text: 'parking', visible: true)
 
-        fill_in('age (facultatif)', with: '2')
+        fill_in('age du candidat (facultatif)', with: '2')
         expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
         expect(page).to have_no_css('label', text: 'tonnage', visible: true)
 
@@ -461,11 +461,11 @@
         click_on 'Accéder à votre dossier'
         click_on 'Modifier mon dossier'
 
-        expect(page).to have_css('label', text: 'age', visible: true)
+        expect(page).to have_css('label', text: 'age du candidat', visible: true)
         expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
         expect(page).to have_no_css('label', text: 'tonnage', visible: true)
 
-        fill_in('age (facultatif)', with: '18')
+        fill_in('age du candidat (facultatif)', with: '18')
         wait_for_autosave(false)
 
         # the champ keeps their previous value so they are all displayed