Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-12-19 16:31:32 +01:00
commit 1f187326e9
3 changed files with 7 additions and 7 deletions

View file

@ -75,7 +75,7 @@
} }
} }
} }
#infos { .infos {
.split-row { .split-row {
margin: 0 0 20px 0; margin: 0 0 20px 0;
} }
@ -106,7 +106,7 @@
color: #000000; color: #000000;
} }
} }
#dossier, #pieces-jointes, #infos, #carto, #private-fields { #dossier, #pieces-jointes, .infos, #carto, #private-fields {
.body { .body {
padding: 20px 20px 0 20px; padding: 20px 20px 0 20px;
color: #000000; color: #000000;

View file

@ -51,7 +51,7 @@
- if @facade.procedure.individual_with_siret - if @facade.procedure.individual_with_siret
.default_data_block .default_data_block
%div.row.show-block#infos %div.row.show-block.infos
%div.header %div.header
%div.col-lg-8.col-md-8.title-no-expanse %div.col-lg-8.col-md-8.title-no-expanse
%div.carret-right %div.carret-right
@ -62,7 +62,7 @@
- unless @facade.entreprise.nil? - unless @facade.entreprise.nil?
.default_data_block .default_data_block
%div.row.show-block#infos_entreprise %div.row.show-block.infos#infos_entreprise
%div.header %div.header
%div.col-lg-12.col-md-12.title %div.col-lg-12.col-md-12.title
%div.carret-right %div.carret-right
@ -71,8 +71,8 @@
%div.body %div.body
= render partial: '/dossiers/infos_entreprise' = render partial: '/dossiers/infos_entreprise'
.default_data_block .default_data_block.default_visible
%div.row.show-block#infos_dossier %div.row.show-block.infos#infos_dossier
%div.header %div.header
%div.col-lg-10.col-md-10.title %div.col-lg-10.col-md-10.title
%div.carret-right %div.carret-right

View file

@ -1,5 +1,5 @@
.default_data_block.default_visible .default_data_block.default_visible
%div.row.show-block#infos %div.row.show-block.infos
%div.header %div.header
%div.col-lg-12.col-md-12.title %div.col-lg-12.col-md-12.title
%div.carret-right %div.carret-right