Checkbox au DSFR

app/assets/stylesheets/forms.scss

@@ -125,7 +125,6 @@
 
     &.editable-champ-checkbox {
       label {
-        padding-left: 28px;
         font-weight: normal;
       }
 

app/components/editable_champ/champ_label_component/champ_label_component.html.haml

@@ -5,8 +5,8 @@
     - render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
 - elsif @champ.legend_label?
   %legend.fr-fieldset__legend.fr-text--regular= render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
+- elsif @champ.single_checkbox?
+  -# no label to add
 - else
   .fr-label.mb-4{ id: @champ.labelledby_id }
     = render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
-
-

app/components/editable_champ/checkbox_component/checkbox_component.html.haml

@@ -1,4 +1,8 @@
-= @form.check_box :value,
-  { required: @champ.required?, id: @champ.input_id, checked: @champ.true?, aria: { describedby: @champ.describedby_id }, class: class_names('required' => @champ.required?)},
-  'true',
-  'false'
+.fr-fieldset__element
+  .fr-checkbox-group
+    = @form.check_box :value,
+      { required: @champ.required?, id: @champ.input_id, checked: @champ.true?, aria: { describedby: @champ.describedby_id }, class: class_names('required' => @champ.required?)},
+      'true',
+      'false'
+    %label.fr-label{ for: @champ.input_id }
+      = render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at

app/models/champ.rb

@@ -164,6 +164,10 @@ class Champ < ApplicationRecord
     false
   end
 
+  def single_checkbox?
+    false
+  end
+
   def input_group_id
     "champ-#{html_id}"
   end

app/models/champs/checkbox_champ.rb

@@ -12,6 +12,14 @@ class Champs::CheckboxChamp < Champs::BooleanChamp
     value_with_legacy == TRUE_VALUE
   end
 
+  def html_label?
+    false
+  end
+
+  def single_checkbox?
+    true
+  end
+
   private
 
   # TODO remove when normalize_checkbox_values is over