DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7710 from mfo/US/fix-dsfr-side-effects

Browse source 
fix(dsfr): side effect
This commit is contained in:
mfo 2022-09-01 17:41:44 +02:00 committed by GitHub
commit 7e6afd2848
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/dsfr.scss
View file

@ -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;
}

11
app/components/types_de_champ_editor/conditions_component.rb
View file

@ -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