From 7a3dddf9decd402d17da9ffc1667f374a87cc468 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 1 Sep 2022 16:29:39 +0200 Subject: [PATCH] fix(dsfr): side effect --- app/assets/stylesheets/dsfr.scss | 14 ++++++++++++++ .../types_de_champ_editor/conditions_component.rb | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/dsfr.scss b/app/assets/stylesheets/dsfr.scss index d7c36ad98..59d7d398c 100644 --- a/app/assets/stylesheets/dsfr.scss +++ b/app/assets/stylesheets/dsfr.scss @@ -1,3 +1,17 @@ +@import "colors"; +// override default text underline of dsfr body [href] { background-image: none; } + +// override default transparent background on inputs +input, +textarea, +select { + background: $white; +} + +// with Marianne font, weight of font is less bolder, so bold it up +.button.primary { + font-weight: bold; +} diff --git a/app/components/types_de_champ_editor/conditions_component.rb b/app/components/types_de_champ_editor/conditions_component.rb index 8e643384b..002bd29ea 100644 --- a/app/components/types_de_champ_editor/conditions_component.rb +++ b/app/components/types_de_champ_editor/conditions_component.rb @@ -22,13 +22,18 @@ class TypesDeChampEditor::ConditionsComponent < ApplicationComponent def logic_conditionnel_button if @condition.nil? - submit_tag(t('.enable_conditionnel'), formaction: add_row_admin_procedure_condition_path(@procedure_id, @tdc.stable_id)) + submit_tag( + t('.enable_conditionnel'), + formaction: add_row_admin_procedure_condition_path(@procedure_id, @tdc.stable_id), + class: 'button small' + ) else submit_tag( t('.disable_conditionnel'), formmethod: 'delete', formnovalidate: true, - data: { confirm: t('.disable_conditionnel_alert') } + data: { confirm: t('.disable_conditionnel_alert') }, + class: 'button small' ) end end @@ -188,7 +193,7 @@ class TypesDeChampEditor::ConditionsComponent < ApplicationComponent tag.span('', class: 'icon add') + tag.span(t('.add_condition')), formaction: add_row_admin_procedure_condition_path(@procedure_id, @tdc.stable_id), formnovalidate: true, - class: 'add-row' + class: 'add-row button small' ) end