diff --git a/source/components/rule/Algorithm.css b/source/components/rule/Algorithm.css index 42d1b1053..64feb8f03 100644 --- a/source/components/rule/Algorithm.css +++ b/source/components/rule/Algorithm.css @@ -112,13 +112,6 @@ margin-right: 0.6em; } -.maximum .description, -.composanteName { - font-weight: 500; - margin-bottom: 0.4em; - margin-left: 1em; -} - .leaf .situationValue { text-align: center; } @@ -145,10 +138,6 @@ margin-top: 0.6em; } -.composantes .composanteName::first-letter { - text-transform: capitalize; -} - .mecanism { border: 1px solid; max-width: 100%; diff --git a/source/engine/mecanismViews/Composantes.css b/source/engine/mecanismViews/Composantes.css index 575aae937..7bd637ecc 100644 --- a/source/engine/mecanismViews/Composantes.css +++ b/source/engine/mecanismViews/Composantes.css @@ -3,16 +3,8 @@ counter-reset: li; padding-left: 1em; } - -.composantes > ol > li.composante::before { - counter-increment: li; -} -.composantes > ol > li.composante::before { - content: counter(li) ')'; - color: grey; - display: inline-block; - width: 1em; - margin-left: -1em; +.composantes > ol > li > ul > li { + list-style-type: none; } .composantes .composanteAttributes { diff --git a/source/engine/mecanismViews/Composantes.js b/source/engine/mecanismViews/Composantes.js index ba44b47fc..45f331ddf 100644 --- a/source/engine/mecanismViews/Composantes.js +++ b/source/engine/mecanismViews/Composantes.js @@ -6,6 +6,7 @@ import { Trans } from 'react-i18next' import { toPairs } from 'ramda' import writtenNumbers from '../../locales/writtenNumbers.yaml' import withLanguage from 'Components/utils/withLanguage' +import colours from 'Engine/mecanismViews/colours' let Comp = withLanguage(function Composantes({ language, @@ -29,11 +30,25 @@ let Comp = withLanguage(function Composantes({

    {explanation.map(c => [ -
  1. -