From 22c28467b129fd374adf798025d76b9e271aa429 Mon Sep 17 00:00:00 2001 From: Mael Date: Thu, 26 Jul 2018 12:37:58 +0200 Subject: [PATCH 1/3] Ajout du logo de l'URSSAF --- source/components/pages/Home.css | 19 ++++++++++++++----- source/components/pages/Home.js | 24 ++++++++++++++++++------ source/images/urssaf.svg | 2 ++ 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 source/images/urssaf.svg diff --git a/source/components/pages/Home.css b/source/components/pages/Home.css index f61732fd6..e7275bdd3 100644 --- a/source/components/pages/Home.css +++ b/source/components/pages/Home.css @@ -1,6 +1,15 @@ - -#marianne { - width: calc(2vw + 2.5em); - margin: .6em auto; - display: block +#logos { + display: flex; + justify-content: center; + align-items: center; +} +#logos a { + margin: 0 0.6em; + display: inline-block; +} +#logos #marianne img { + width: calc(2vw + 2.5em); +} +#logos #urssaf img { + width: calc(4vw + 3em); } diff --git a/source/components/pages/Home.js b/source/components/pages/Home.js index 44b904854..dced4d8fa 100644 --- a/source/components/pages/Home.js +++ b/source/components/pages/Home.js @@ -8,13 +8,25 @@ const Home = () => (
- - + - + href="https://beta.gouv.fr" + target="_blank" + rel="noopener noreferrer"> + Un service de l'État français + + + Un service des URSSAF + +
) diff --git a/source/images/urssaf.svg b/source/images/urssaf.svg new file mode 100644 index 000000000..36882ca4a --- /dev/null +++ b/source/images/urssaf.svg @@ -0,0 +1,2 @@ + +image/svg+xml \ No newline at end of file From 31520ade6f2054f010b1a5a9cb0914b1f22b1a2f Mon Sep 17 00:00:00 2001 From: Mael Date: Thu, 26 Jul 2018 15:31:43 +0200 Subject: [PATCH 2/3] Logos plus grands sur mobile --- source/components/pages/Home.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/components/pages/Home.css b/source/components/pages/Home.css index e7275bdd3..f98ed9ff6 100644 --- a/source/components/pages/Home.css +++ b/source/components/pages/Home.css @@ -8,8 +8,8 @@ display: inline-block; } #logos #marianne img { - width: calc(2vw + 2.5em); + width: calc(1vw + 4em); } #logos #urssaf img { - width: calc(4vw + 3em); + width: calc(1vw + 6em); } From 6971bd5b984ad6b789aa1159c8a66990c0f9a4cd Mon Sep 17 00:00:00 2001 From: Mael Date: Fri, 27 Jul 2018 17:45:49 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Mention=20de=20l'ACOSS=20dans=20/=C3=A0-pro?= =?UTF-8?q?pos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.yaml | 1 + source/components/pages/About.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 0f6217b23..c8a79f693 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -11,6 +11,7 @@ rules: no-global-assign: 0 no-unsafe-negation: 0 react/prop-types: 0 + react/no-unescaped-entities: 0 parser: babel-eslint plugins: diff --git a/source/components/pages/About.js b/source/components/pages/About.js index 8172cf733..334df5085 100644 --- a/source/components/pages/About.js +++ b/source/components/pages/About.js @@ -11,7 +11,7 @@ export default class About extends Component {

À propos

- + L'incubateur des services numériques de l'État {' '} a lancé en 2014 le développement d’une ressource ouverte de @@ -20,14 +20,19 @@ export default class About extends Component {

Ce premier service, un{' '} - module de simulation des sommes en jeu lors d'une embauche, - peut être{' '} + simulateur des sommes en jeu lors d'une embauche, peut être{' '} intégré facilement et gratuitement par toute organisation sur son site Web.

+ +

+ Début 2018, l'ACOSS (la tête des + URSSAF) nous rejoint pour consolider ce simulateur. +

+

Suivez nos mises à jour sur{' '} - + twitter