diff --git a/source/components/RuleLink.js b/source/components/RuleLink.js index 8db0c3a7f..69484ac17 100644 --- a/source/components/RuleLink.js +++ b/source/components/RuleLink.js @@ -15,7 +15,7 @@ type Props = Règle & { } const RuleLink = ({ lien, nom, colours: { colour }, match, style }: Props) => ( {capitalise0(nom)} diff --git a/source/components/RulePage.js b/source/components/RulePage.js index a35115ee2..d5d51b5cd 100644 --- a/source/components/RulePage.js +++ b/source/components/RulePage.js @@ -51,12 +51,15 @@ export default class RulePage extends Component { } renderRule(dottedName) { return ( -
+
{!this.props.noUserInputSelector && ( )} - +
diff --git a/source/components/SearchBar.js b/source/components/SearchBar.js index b34e5dc00..1f2afd300 100644 --- a/source/components/SearchBar.js +++ b/source/components/SearchBar.js @@ -75,7 +75,9 @@ export default class SearchBar extends React.Component { if (selectedOption != null) { this.props.finally && this.props.finally() return ( - + ) } return ( @@ -102,7 +104,12 @@ export default class SearchBar extends React.Component {
    {rules.map(rule => (
  • - + {rule.title || capitalise0(rule.name)}
  • diff --git a/source/components/SearchButton.js b/source/components/SearchButton.js index 36ef0a992..43aaf64a9 100644 --- a/source/components/SearchButton.js +++ b/source/components/SearchButton.js @@ -42,6 +42,7 @@ export default class SearchButton extends Component { showDefaultList={false} finally={this.close} rules={flatRules} + rulePagesBasePath={this.props.rulePagesBasePath} /> ) : ( diff --git a/source/components/TargetSelection.js b/source/components/TargetSelection.js index 9bab9e1b1..db4e03f74 100644 --- a/source/components/TargetSelection.js +++ b/source/components/TargetSelection.js @@ -157,7 +157,7 @@ let Header = ({ - + {target.title || target.name} diff --git a/source/components/ui/Typography.css b/source/components/ui/Typography.css index f9d837ae5..5755a8a0b 100644 --- a/source/components/ui/Typography.css +++ b/source/components/ui/Typography.css @@ -11,10 +11,13 @@ body { font-family: 'Roboto', sans-serif; } +h1, +h2 { + margin-top: 2.5rem; + margin-bottom: 1.5rem; +} h1 { font-size: 2.8rem; - margin-top: 1.5rem; - margin-bottom: 2rem; } h2 { font-size: 2.1rem; diff --git a/source/sites/embauche.gouv.fr/pages/RulesList.js b/source/sites/embauche.gouv.fr/pages/RulesList.js index 322ac98fd..b935a7fdc 100644 --- a/source/sites/embauche.gouv.fr/pages/RulesList.js +++ b/source/sites/embauche.gouv.fr/pages/RulesList.js @@ -14,7 +14,11 @@ export default class RulesList extends Component { return (

    Explorez notre base de règles

    - +
    ) } diff --git a/source/webpack.dev.js b/source/webpack.dev.js index 1082f8b89..7c163940a 100644 --- a/source/webpack.dev.js +++ b/source/webpack.dev.js @@ -16,11 +16,11 @@ module.exports = { history({ rewrites: [ { - from: /^\/infrance\/.*$/, + from: /^\/infrance\/.*$|^\/infrance$/, to: '/infrance.html' }, { - from: /^\/embauche\/.*$/, + from: /^\/embauche\/.*$|^\/embauche$/, to: '/embauche.html' } ]