From 54802a282a7135b25ff865ea88575be292ad554d Mon Sep 17 00:00:00 2001 From: mama Date: Fri, 1 Dec 2017 13:17:37 +0100 Subject: [PATCH] :art: Mise en valeur des salaires dans la visu niveau 2 --- source/components/ResultsGrid.js | 15 ++++++--------- source/engine/mecanismViews/Somme.css | 10 ++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/source/components/ResultsGrid.js b/source/components/ResultsGrid.js index 56abec5a9..ab32d9c83 100644 --- a/source/components/ResultsGrid.js +++ b/source/components/ResultsGrid.js @@ -80,12 +80,9 @@ export default class ResultsGrid extends Component { - - + @@ -97,10 +94,10 @@ export default class ResultsGrid extends Component { - + @@ -158,7 +155,7 @@ class Row extends Component { ? [] : R.keys(detail).map(subCellName => ( - +
- - {humanFigure(2)(brut)} (salaire brut) - - {humanFigure(2)(brut)} (salaire brut) + Salaire brut + {humanFigure(2)(brut)}
={humanFigure(2)(net)} (salaire net){humanFigure(2)(net)}
Salaire net
= - {humanFigure(2)(total)} (salaire total) + {humanFigure(2)(total)}
Salaire total
 {title(subCellName)} {title(subCellName)} - {humanFigure(2)(subCell(detail, subCellName, 'salariĆ©'))} diff --git a/source/engine/mecanismViews/Somme.css b/source/engine/mecanismViews/Somme.css index 38bac0cb8..0c80ab285 100644 --- a/source/engine/mecanismViews/Somme.css +++ b/source/engine/mecanismViews/Somme.css @@ -65,3 +65,13 @@ .somme > table { border-bottom: 1px solid rgba(51, 51, 80, 0.15); } + + +#sommeBase { + text-align: center; +} + +.somme .annotation { + color: #2975D1; + font-weight: 600; +}