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

Merge branch 'dev'

Browse source
This commit is contained in:
Simon Lehericey 2017-10-25 17:19:05 +02:00
commit 38afb1f111
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/new_design/procedure_list.scss
View file

@ -30,6 +30,10 @@
width: 93px; width: 93px;
margin-right: 3 * $default-spacer; margin-right: 3 * $default-spacer;
flex-shrink: 0; flex-shrink: 0;
background-image: url("your/url/here");
background-size: contain;
background-repeat: no-repeat;
background-position: 95% 50%;
} }
.procedure-title { .procedure-title {

4
app/views/new_gestionnaire/procedures/index.html.haml
View file

@ -7,9 +7,7 @@
= link_to(procedure_path(p)) do = link_to(procedure_path(p)) do
.flex .flex
.procedure-logo .procedure-logo{ style: p.logo.present? ? "background-image: url(#{p.logo.url})" : nil }
- if p.logo.present?
= image_tag p.logo, alt: "Logo de la procédure"
.procedure-details .procedure-details
%p.procedure-title %p.procedure-title

2
app/views/users/description/champs/_render_list_champs.html.haml
View file

@ -60,4 +60,4 @@
- unless champ.description.empty? - unless champ.description.empty?
%div{ id: "description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') } %div{ id: "description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') }
= sanitize(champ.description_with_links, attributes: %w(href target)) = simple_format(sanitize(champ.description_with_links, attributes: %w(href target)))