Mise en commun des logos

pull/294/head
Mael 2018-08-04 12:20:08 +02:00
parent abf2532fff
commit 8ade112519
8 changed files with 24 additions and 64 deletions

View File

@ -1,5 +1,5 @@
import React, { Component } from 'react'
import withLanguage from './withLanguage'
import withLanguage from 'Components/utils/withLanguage'
import './AnimatedTargetValue.css'
import ReactCSSTransitionGroup from 'react-addons-css-transition-group'

View File

@ -1,15 +0,0 @@
#logos {
display: flex;
justify-content: center;
align-items: center;
}
#logos a {
margin: 0 0.6em;
display: inline-block;
}
#logos #marianne img {
width: calc(1vw + 4em);
}
#logos #urssaf img {
width: calc(1vw + 6em);
}

View File

@ -1,33 +0,0 @@
import React from 'react'
import './Pages.css'
import './Home.css'
import Simu from '../Simu'
import PreviousSimulationBanner from '../PreviousSimulationBanner'
const Home = () => (
<div id="home" className="page">
<PreviousSimulationBanner />
<Simu />
<div id="logos">
<a
id="marianne"
href="https://beta.gouv.fr"
target="_blank"
rel="noopener noreferrer">
<img
src={require('Images/marianne.svg')}
alt="Un service de l'État français"
/>
</a>
<a
id="urssaf"
href="https://www.urssaf.fr"
target="_blank"
rel="noopener noreferrer">
<img src={require('Images/urssaf.svg')} alt="Un service des URSSAF" />
</a>
</div>
</div>
)
export default Home

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="1538" height="906" id="svg2" inkscape:version="0.48.1 " sodipodi:docname="Aa.svg" viewBox="0 0 1538 906">
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="1538" height="906" viewBox="0 0 1538 906" id="svg2" inkscape:version="0.48.1 " sodipodi:docname="Aa.svg">
<metadata id="metadata11">
<rdf:RDF>
<cc:Work rdf:about="">

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -11,6 +11,9 @@
margin: 0 0.6em;
display: inline-block;
}
#logos a::after {
display: none;
}
#logos #marianne img {
width: calc(1vw + 4em);
}

View File

@ -7,8 +7,8 @@ import { Link } from 'react-router-dom'
import { config } from 'react-spring'
import * as Animate from 'Ui/animate'
import './Landing.css'
import marianneSvg from './marianne.svg'
import urssafSvg from './urssaf.svg'
import marianneSvg from 'Images/marianne.svg'
import urssafSvg from 'Images/urssaf.svg'
const Landing = ({ colours: { colour } }) => (
<>

View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" enable-background="new 0 0 728.504 515.906" viewBox="0 0 563.98099 181.67006" height="181.67006" width="563.98102" y="0px" x="0px" id="Calque_1" version="1.1"><metadata id="metadata4200"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs4198" /><g transform="translate(-81.992015,-168.59895)" id="g4176"><path style="fill:#005aa2" id="path4178" d="m 213.839,289.008 c -12.566,0 -19.103,-8.138 -19.103,-22.155 l 0,-29.49 7.625,0 0,29.273 c 0,9.589 3.995,14.745 11.623,14.745 7.989,0 11.767,-4.939 11.767,-14.235 l 0,-29.783 7.628,0 0,29.635 c 0,14.238 -6.902,22.01 -19.54,22.01 z" /><path style="fill:#005aa2" id="path4180" d="m 286.181,267.435 10.387,20.773 -8.788,0 -10.097,-20.121 -11.478,0 0,20.121 -7.481,0 0,-50.846 22.3,0 c 8.861,0 16.342,4.722 16.342,15.181 0.001,8.137 -4.285,13.149 -11.185,14.892 z m -5.157,-22.88 -14.819,0 0,16.342 14.819,0 c 5.084,0 8.643,-2.614 8.643,-8.134 0,-5.303 -3.486,-8.208 -8.643,-8.208 z" /><path style="fill:#005aa2" id="path4182" d="m 336.876,289.008 c -7.409,0 -13.801,-3.195 -18.086,-8.206 l 5.447,-5.305 c 3.414,3.705 8.426,6.028 13.22,6.028 7.119,0 10.533,-2.468 10.533,-7.407 0,-3.922 -2.978,-5.884 -11.478,-8.427 -10.75,-3.195 -15.906,-5.884 -15.906,-14.964 0,-8.789 7.408,-14.163 16.778,-14.163 6.9,0 12.131,2.542 16.634,6.9 l -5.375,5.448 c -3.195,-3.269 -6.828,-4.867 -11.839,-4.867 -5.956,0 -8.498,2.905 -8.498,6.319 0,3.559 2.323,5.303 11.112,7.917 10.025,3.053 16.272,6.247 16.272,15.326 0,9.152 -5.811,15.401 -18.814,15.401 z" /><path style="fill:#005aa2" id="path4184" d="m 394.834,289.008 c -7.406,0 -13.8,-3.195 -18.084,-8.206 l 5.449,-5.305 c 3.412,3.705 8.424,6.028 13.218,6.028 7.121,0 10.533,-2.468 10.533,-7.407 0,-3.922 -2.978,-5.884 -11.478,-8.427 -10.75,-3.195 -15.906,-5.884 -15.906,-14.964 0,-8.789 7.406,-14.163 16.778,-14.163 6.9,0 12.129,2.542 16.634,6.9 l -5.373,5.448 c -3.199,-3.269 -6.832,-4.867 -11.844,-4.867 -5.955,0 -8.496,2.905 -8.496,6.319 0,3.559 2.323,5.303 11.112,7.917 10.023,3.053 16.272,6.247 16.272,15.326 10e-4,9.152 -5.81,15.401 -18.815,15.401 z" /><path style="fill:#005aa2" id="path4186" d="m 471.104,288.208 -4.288,-12.057 -20.339,0 -4.212,12.057 -7.917,0 18.302,-50.846 8.065,0 18.522,50.846 -8.133,0 z M 460.422,257.63 c -1.234,-3.633 -3.268,-9.517 -3.85,-11.695 -0.579,2.178 -2.396,7.989 -3.702,11.767 l -4.07,11.623 15.692,0 -4.07,-11.695 z" /><path style="fill:#005aa2" id="path4188" d="m 509.375,244.846 0,13.291 14.601,0 0,7.482 -14.601,0 0,22.59 -7.627,0 0,-50.846 32.761,0 0,7.483 -25.134,0 z" /></g><g transform="translate(-81.992015,-168.59895)" id="g4190"><path style="fill:#005aa2" id="path4192" d="m 108.667,266.495 26.083,0 c 0,0 5.529,29.056 25.969,49.978 20.451,20.932 36.812,28.001 36.812,28.001 0,0 -30.16,0.138 -61.837,-28.521 -23.734,-21.495 -27.027,-49.458 -27.027,-49.458" /><path style="fill:#009475" id="path4194" d="m 516.638,174.464 c 0,0 54.044,-2.932 83.007,29.142 18.998,21.063 19.653,39.553 19.653,39.553 l -28.446,0.646 c 0,0 -2.074,-20.108 -14.32,-37.433 -22.032,-31.168 -59.894,-31.908 -59.894,-31.908" /></g></svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -12,18 +12,20 @@ module.exports = {
Components: path.resolve('source/components/'),
Selectors: path.resolve('source/selectors/'),
Reducers: path.resolve('source/reducers/'),
Types: path.resolve('source/types/')
Types: path.resolve('source/types/'),
Images: path.resolve('source/images/')
}
},
entry: {
infrance: ['./source/sites/mycompanyinfrance.fr/entry.js'],
embauche: ['./source/sites/embauche.gouv.fr/entry.js'],
// To not introduce breaking into the iframe integration, we serve simulateur.js from a 'dist' subdirectory
'dist/simulateur': ['./source/sites/embauche.gouv.fr/iframe-script.js'],
// To not introduce breaking into the iframe integration, we serve simulateur.js from a 'dist' subdirectory
'dist/simulateur': ['./source/sites/embauche.gouv.fr/iframe-script.js']
},
output: {
path: path.resolve('./dist/'),
filename: ({ chunk }) => chunk.name === 'dist/simulateur' ? '[name].js' : '[name].[hash].js'
filename: ({ chunk }) =>
chunk.name === 'dist/simulateur' ? '[name].js' : '[name].[hash].js'
},
module: {
rules: [
@ -83,16 +85,22 @@ module.exports = {
template: 'index.html',
chunks: ['infrance'],
title: 'My company in france 🇫🇷',
description: "The easy guide to help you start your business in france. From registering your company to hiring your first employee.",
description:
'The easy guide to help you start your business in france. From registering your company to hiring your first employee.',
filename: 'infrance.html'
}),
new HTMLPlugin({
template: 'index.html',
chunks: ['embauche'],
title: 'Simulateur d\'embauche 🤝',
description: "Simulation du prix d'une embauche en France et calcul du salaire net à partir du brut : CDD, statut cadre, cotisations sociales, retraite...",
filename: 'embauche.html',
title: "Simulateur d'embauche 🤝",
description:
"Simulation du prix d'une embauche en France et calcul du salaire net à partir du brut : CDD, statut cadre, cotisations sociales, retraite...",
filename: 'embauche.html'
}),
new CopyPlugin(['./manifest.webmanifest', './source/sites/embauche.gouv.fr/images/logo', './robots.txt'])
new CopyPlugin([
'./manifest.webmanifest',
'./source/sites/embauche.gouv.fr/images/logo',
'./robots.txt'
])
]
}