From 267591f27e7c49dd131968938c5d262f00245550 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Mon, 16 Oct 2017 17:37:19 +0200 Subject: [PATCH 1/3] =?UTF-8?q?[Fix=20#854]=20Give=20a=20length=20to=20lib?= =?UTF-8?q?ell=C3=A9=20cells?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/new_design/dossier_champs.scss | 7 +++++++ app/views/new_gestionnaire/dossiers/_champs.html.haml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/new_design/dossier_champs.scss diff --git a/app/assets/stylesheets/new_design/dossier_champs.scss b/app/assets/stylesheets/new_design/dossier_champs.scss new file mode 100644 index 000000000..f8e444fab --- /dev/null +++ b/app/assets/stylesheets/new_design/dossier_champs.scss @@ -0,0 +1,7 @@ +@import "constants"; + +.dossier-champs { + .libelle { + width: 250px; + } +} diff --git a/app/views/new_gestionnaire/dossiers/_champs.html.haml b/app/views/new_gestionnaire/dossiers/_champs.html.haml index 41f1bc85a..7c751e40b 100644 --- a/app/views/new_gestionnaire/dossiers/_champs.html.haml +++ b/app/views/new_gestionnaire/dossiers/_champs.html.haml @@ -1,4 +1,4 @@ -%table.table.vertical +%table.table.vertical.dossier-champs %tbody - champs.each do |c| %tr @@ -6,7 +6,7 @@ %th.header-section{ colspan: 2 } = c.libelle - elsif c.type_champ != "explication" - %th + %th.libelle = "#{c.libelle} :" %td = sanitize(c.value) From 12223c21f159ee7142e020304379e47224d75e37 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Mon, 16 Oct 2017 17:38:41 +0200 Subject: [PATCH 2/3] [Ref #832] Improve the display of rich text in the Demande tab --- .../new_design/dossier_champs.scss | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/app/assets/stylesheets/new_design/dossier_champs.scss b/app/assets/stylesheets/new_design/dossier_champs.scss index f8e444fab..d4bd2b00d 100644 --- a/app/assets/stylesheets/new_design/dossier_champs.scss +++ b/app/assets/stylesheets/new_design/dossier_champs.scss @@ -4,4 +4,63 @@ .libelle { width: 250px; } + + i { + font-style: italic; + } + + b { + font-weight: bold; + } + + small { + font-size: 14px; + } + + ol, + ul { + list-style: inside; + } + + ol { + list-style-type: decimal; + } + + blockquote { + margin: $default-padding 0 $default-padding $default-padding; + } + + p { + margin-bottom: $default-padding; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + margin-bottom: $default-padding; + line-height: 1; + } + + h2 { + font-size: 32px; + } + + h3 { + font-size: 28px; + } + + h4 { + font-size: 24px; + } + + h5 { + font-size: 20px; + } + + h6 { + font-size: 16px; + } } From c9d4baa71b2ee48d96097f4a6c7fdc25794279c7 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Mon, 16 Oct 2017 17:39:01 +0200 Subject: [PATCH 3/3] Improve the styling of the Demande tab --- app/assets/stylesheets/new_design/dossier_champs.scss | 5 +++++ app/assets/stylesheets/new_design/table.scss | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/new_design/dossier_champs.scss b/app/assets/stylesheets/new_design/dossier_champs.scss index d4bd2b00d..e1f18cf17 100644 --- a/app/assets/stylesheets/new_design/dossier_champs.scss +++ b/app/assets/stylesheets/new_design/dossier_champs.scss @@ -1,6 +1,11 @@ @import "constants"; .dossier-champs { + th, + td { + vertical-align: top; + } + .libelle { width: 250px; } diff --git a/app/assets/stylesheets/new_design/table.scss b/app/assets/stylesheets/new_design/table.scss index 90903b7e3..28afbb340 100644 --- a/app/assets/stylesheets/new_design/table.scss +++ b/app/assets/stylesheets/new_design/table.scss @@ -27,7 +27,7 @@ } &.vertical { - font-size: 14px; + font-size: 16px; line-height: 22px; tr {