diff --git a/index.html b/index.html index b4b4c25e9..f8455652f 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,8 @@
- + \ No newline at end of file diff --git a/source/components/CurrencyInput/CurrencyInput.css b/source/components/CurrencyInput/CurrencyInput.css index f5732b45d..471a82e59 100644 --- a/source/components/CurrencyInput/CurrencyInput.css +++ b/source/components/CurrencyInput/CurrencyInput.css @@ -16,7 +16,7 @@ margin: 0; width: inherit; color: inherit; - background-color: inherit; + background-color: transparent; font-size: inherit; } diff --git a/source/components/Distribution.css b/source/components/Distribution.css index b542411b9..2d31b09fa 100644 --- a/source/components/Distribution.css +++ b/source/components/Distribution.css @@ -111,3 +111,13 @@ grid-column: 2 / span 2; border-top: solid 1px rgba(0, 0, 0, 0.7); } + +/* IE11 Special */ +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + .distribution-chart__total > * { + margin: 8px; + } + .distribution-chart__total-border { + border: none; + } +} diff --git a/source/components/Distribution.js b/source/components/Distribution.js index e449b658a..cc65e9282 100644 --- a/source/components/Distribution.js +++ b/source/components/Distribution.js @@ -161,7 +161,7 @@ let ChartItemBar = ({ styles, colour, montant, total }) => ( backgroundColor: colour }} /> -
+
h4:nth-child(1), + .payslip__cotisationsSection > a, + div.payslip__total { + width: 50%; + display: inline-block; + } + .payslip__cotisationsSection > h4:not(:nth-child(1)) { + width: 25%; + display: inline-block; + } + .payslip__container .montant { + display: inline-block; + width: 25%; + text-align: right; + } + .payslip__salarySection > a { + width: 75%; + display: inline-block; + } +} diff --git a/source/components/TargetSelection.css b/source/components/TargetSelection.css index e9565708f..a97fe6413 100644 --- a/source/components/TargetSelection.css +++ b/source/components/TargetSelection.css @@ -51,6 +51,13 @@ #targetSelection .progressCircle svg { width: 2em; } +/* IE */ +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + #targetSelection .progressCircle svg { + max-height: 2.5rem; + } +} + #targetSelection .progressCircle i { color: #5de662; font-size: 220%; diff --git a/source/components/ui/reset.css b/source/components/ui/reset.css index fc03a697c..0068a8bbb 100644 --- a/source/components/ui/reset.css +++ b/source/components/ui/reset.css @@ -6,7 +6,6 @@ html { box-sizing: border-box; - height: 100%; } *, *:before, @@ -16,7 +15,6 @@ html { body { margin: 0; - height: 100%; } [hidden], .js-only { diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/Home.js b/source/sites/mycompanyinfrance.fr/pages/Company/Home.js index a2fd9f32c..51b5e8f0d 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/Home.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/Home.js @@ -10,7 +10,7 @@ const CreateMyCompany = ({ match }: Props) => ( <>

Register a company

- My companyaa is already registered with the French Administration + My company is already registered with the French Administration

The French business law defines more than 20 possible legal statuses to diff --git a/source/sites/mycompanyinfrance.fr/pages/CostsAndBenefits/index.js b/source/sites/mycompanyinfrance.fr/pages/CostsAndBenefits/index.js index d7c1f3912..80d46f4fc 100644 --- a/source/sites/mycompanyinfrance.fr/pages/CostsAndBenefits/index.js +++ b/source/sites/mycompanyinfrance.fr/pages/CostsAndBenefits/index.js @@ -14,7 +14,7 @@ class Hiring extends Component { {!this.props.hideText && ( <> -

Social protection: costs assssssnd benefits

+

Social protection: costs and benefits

France has chosen to provide its citizens with a high-level social safety net. This mandatory system is based on solidarity and diff --git a/source/sites/mycompanyinfrance.fr/pages/Header/StepsHeader.css b/source/sites/mycompanyinfrance.fr/pages/Header/StepsHeader.css index 8be2077ef..216616634 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Header/StepsHeader.css +++ b/source/sites/mycompanyinfrance.fr/pages/Header/StepsHeader.css @@ -47,11 +47,20 @@ opacity: 1; flex: 1; } +/* IE */ +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + .ui__.steps-header a.active { + min-width: 80%; + } + .ui__.steps-header a { + flex-shrink: 1; + } +} .ui__.steps-header .progress { margin-top: 0.4rem; height: 0.5rem; - background: rgb(41, 117, 209, 0.2); + background: rgba(41, 117, 209, 0.2); border-radius: 0.1rem; width: 100%; } diff --git a/source/webpack.common.js b/source/webpack.common.js index 0becd640e..ef52388a7 100644 --- a/source/webpack.common.js +++ b/source/webpack.common.js @@ -16,8 +16,8 @@ module.exports = { } }, entry: { + infrance: ['./source/sites/mycompanyinfrance.fr/entry.js'], embauche: ['./source/sites/embauche.gouv.fr/entry.js'], - infrance: ['./source/sites/mycompanyinfrance.fr/entry.js'] }, output: { path: path.resolve('./dist/'), @@ -83,13 +83,13 @@ module.exports = { plugins: [ new HTMLPlugin({ template: 'index.html', - chunks: ['embauche'], - filename: 'embauche.html', + chunks: ['infrance'], + filename: 'infrance.html' }), new HTMLPlugin({ template: 'index.html', - chunks: ['infrance'], - filename: 'infrance.html' + chunks: ['embauche'], + filename: 'embauche.html', }), new HTMLPlugin({ template: 'couleur.html', diff --git a/source/webpack.dev.js b/source/webpack.dev.js index 125769966..1082f8b89 100644 --- a/source/webpack.dev.js +++ b/source/webpack.dev.js @@ -4,6 +4,7 @@ const common = require('./webpack.common.js') const webpackServeWaitpage = require('webpack-serve-waitpage') const history = require('connect-history-api-fallback') const convert = require('koa-connect') + module.exports = { ...common, mode: 'development',