From cd478395315e0448a0d107119f505e8d5d7b2c55 Mon Sep 17 00:00:00 2001 From: mama Date: Thu, 14 Dec 2017 19:24:46 +0100 Subject: [PATCH 1/7] Ajout du webmanifest --- index.html | 2 +- manifest.webmanifest | 18 +++ source/images/brouillons/logo.svg | 200 ++++++++++++++++++++++++++++-- source/images/logo-embauche.png | Bin 0 -> 4163 bytes 4 files changed, 208 insertions(+), 12 deletions(-) create mode 100644 manifest.webmanifest create mode 100644 source/images/logo-embauche.png diff --git a/index.html b/index.html index fba50dce8..51458f227 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ Simulateur d'embauche - + diff --git a/manifest.webmanifest b/manifest.webmanifest new file mode 100644 index 000000000..c2c23b6da --- /dev/null +++ b/manifest.webmanifest @@ -0,0 +1,18 @@ +{ + "name": "Simulateur d'embauche", + "short_name": "Embauche", + "description": "Jongler entre les différents salaires lors d'une embauche", + "display": "standalone", + "lang": "fr", + "orientation": "portrait-primary", + "theme_color": "#2975D1", + "icons": [{ + "src": "/dist/images/marianne.svg", + "sizes": "48x48 72x72 96x96 128x128 256x256", + "type": "image/svg" + }], + "related_applications": [{ + "platform": "web" + }], + "background_color": "#2975D1" +} diff --git a/source/images/brouillons/logo.svg b/source/images/brouillons/logo.svg index 62f5ab228..0ab22b9d2 100644 --- a/source/images/brouillons/logo.svg +++ b/source/images/brouillons/logo.svg @@ -15,7 +15,7 @@ viewBox="0 0 1052.3622 744.09448" id="svg36777" version="1.1" - inkscape:version="0.92.1 r15371" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="maison2.svg"> @@ -129,18 +129,20 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.90509668" - inkscape:cx="220.81876" - inkscape:cy="392.29905" + inkscape:zoom="2.8969951" + inkscape:cx="917.84226" + inkscape:cy="591.76529" inkscape:document-units="px" - inkscape:current-layer="g5143-2-8" + inkscape:current-layer="g1180-1-1" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1046" + inkscape:window-height="1019" inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-y="27" inkscape:window-maximized="1" - showguides="true" /> + showguides="true" + inkscape:measure-start="0,0" + inkscape:measure-end="0,0" /> @@ -392,7 +394,7 @@ > + + + + + + + € + + + + + + + + € + + + + + + + + + € + + + + + + € + + + + diff --git a/source/images/logo-embauche.png b/source/images/logo-embauche.png new file mode 100644 index 0000000000000000000000000000000000000000..1a6e051167bba4020b8daf9d58af105a9ef8644f GIT binary patch literal 4163 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 Date: Wed, 20 Dec 2017 15:18:10 +0100 Subject: [PATCH 2/7] =?UTF-8?q?:art:=20Id=C3=A9e=20de=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/images/brouillons/logo.svg | 54 +++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/source/images/brouillons/logo.svg b/source/images/brouillons/logo.svg index 0ab22b9d2..3a7acd1ac 100644 --- a/source/images/brouillons/logo.svg +++ b/source/images/brouillons/logo.svg @@ -129,16 +129,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8969951" - inkscape:cx="917.84226" - inkscape:cy="591.76529" + inkscape:zoom="3.3831038" + inkscape:cx="926.04996" + inkscape:cy="562.1092" inkscape:document-units="px" inkscape:current-layer="g1180-1-1" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1019" - inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-height="1046" + inkscape:window-x="1920" + inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:measure-start="0,0" @@ -1573,6 +1573,12 @@ + € + + + + + + € + + Date: Wed, 7 Feb 2018 18:17:35 +0100 Subject: [PATCH 3/7] =?UTF-8?q?:art:=202=C3=A8me=20id=C3=A9e=20de=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logo-simulateur.svg | 232 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 logo-simulateur.svg diff --git a/logo-simulateur.svg b/logo-simulateur.svg new file mode 100644 index 000000000..dfb5e04af --- /dev/null +++ b/logo-simulateur.svg @@ -0,0 +1,232 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2300€ + + + rgb(41, 117, 209) + + + + + From 833a13109e1ddc796d75d2640dfaac513f1eb6cc Mon Sep 17 00:00:00 2001 From: mama Date: Thu, 8 Feb 2018 16:02:58 +0100 Subject: [PATCH 4/7] v0 du logo du simulateur --- logo-simulateur.svg | 232 ---------- manifest.webmanifest | 36 +- source/components/pages/Header.css | 12 +- source/components/pages/Header.js | 4 +- source/images/logo-simulateur.brouillon.svg | 487 ++++++++++++++++++++ source/images/logo-simulateur.svg | 297 ++++++++++++ 6 files changed, 815 insertions(+), 253 deletions(-) delete mode 100644 logo-simulateur.svg create mode 100644 source/images/logo-simulateur.brouillon.svg create mode 100644 source/images/logo-simulateur.svg diff --git a/logo-simulateur.svg b/logo-simulateur.svg deleted file mode 100644 index dfb5e04af..000000000 --- a/logo-simulateur.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2300€ - - - rgb(41, 117, 209) - - - - - diff --git a/manifest.webmanifest b/manifest.webmanifest index c2c23b6da..56499a998 100644 --- a/manifest.webmanifest +++ b/manifest.webmanifest @@ -1,18 +1,22 @@ { - "name": "Simulateur d'embauche", - "short_name": "Embauche", - "description": "Jongler entre les différents salaires lors d'une embauche", - "display": "standalone", - "lang": "fr", - "orientation": "portrait-primary", - "theme_color": "#2975D1", - "icons": [{ - "src": "/dist/images/marianne.svg", - "sizes": "48x48 72x72 96x96 128x128 256x256", - "type": "image/svg" - }], - "related_applications": [{ - "platform": "web" - }], - "background_color": "#2975D1" + "name": "Simulateur d'embauche", + "short_name": "Embauche", + "description": "Jongler entre les différents salaires lors d'une embauche", + "display": "standalone", + "lang": "fr", + "orientation": "portrait-primary", + "theme_color": "#2975D1", + "icons": [ + { + "src": "/dist/images/logo-simulateur.svg", + "sizes": "48x48 72x72 96x96 128x128 256x256", + "type": "image/svg" + } + ], + "related_applications": [ + { + "platform": "web" + } + ], + "background_color": "#2975D1" } diff --git a/source/components/pages/Header.css b/source/components/pages/Header.css index 1a5e1a674..aad7479a9 100644 --- a/source/components/pages/Header.css +++ b/source/components/pages/Header.css @@ -10,13 +10,19 @@ align-items: center; } #header h1 { - font-size: calc(1vw + 150%); + font-size: calc(1vw + 130%); font-weight: 600; display: inline-block; - margin-left: 0.8em; - color: #333; + margin-left: 0em; + color: #3c4963; + width: 10em; + line-height: 1em; + margin-bottom: 0.6em; } +#header #logo { + width: calc(1vw + 5em); +} #header #marianne { width: calc(3vw + 5em); } diff --git a/source/components/pages/Header.js b/source/components/pages/Header.js index 391dfef6b..0e63eca70 100644 --- a/source/components/pages/Header.js +++ b/source/components/pages/Header.js @@ -44,8 +44,8 @@ export class Header extends Component {