theme.spacings.sm} 0;
`
-const Logo = styled.img.attrs({ 'data-test-id': 'logo img' })`
- height: 70%;
+const StyledLogo = styled.div`
+ height: 3rem;
- @media (min-width: ${({ theme }) => theme.breakpointsWidth.sm}) {
- height: 80%;
+ @media (max-width: ${({ theme }) => theme.breakpointsWidth.sm}) {
+ height: 2.5rem;
}
`
diff --git a/site/source/components/utils/colors.tsx b/site/source/components/utils/colors.tsx
index 6d4b3093c..8c70b3d66 100644
--- a/site/source/components/utils/colors.tsx
+++ b/site/source/components/utils/colors.tsx
@@ -39,7 +39,7 @@ export function ThemeColorsProvider({ color, children }: ProviderProps) {
[color]
)
useEffect(() => {
- divRef.current?.style.setProperty(`--${HUE_CSS_VARIABLE_NAME}`, '' + hue)
+ divRef.current?.style.setProperty(`--${HUE_CSS_VARIABLE_NAME}`, `${hue}deg`)
divRef.current?.style.setProperty(
`--${SATURATION_CSS_VARIABLE_NAME}`,
`${saturation}%`
diff --git a/site/source/iframe-integration-script.js b/site/source/iframe-integration-script.js
index 1daa1d278..ef81efb38 100644
--- a/site/source/iframe-integration-script.js
+++ b/site/source/iframe-integration-script.js
@@ -1,6 +1,5 @@
import { iframeResizer } from 'iframe-resizer'
-import logoFrSvg from 'Images/logo-monentreprise.svg'
-import logoEnSvg from 'Images/logo-mycompany.svg'
+
import { hexToHSL } from './hexToHSL'
let script =
@@ -63,26 +62,13 @@ params.append('utm_medium', 'iframe')
params.append('utm_campaign', 'newtext')
url.search = params.toString()
const simulateurURL = url.toString()
-url.pathname = '/simulateurs'
-const simulateursURL = url.toString()
-url.pathname = '/'
-const monEntrepriseUrl = url.toString()
+
links.innerHTML = `
- Ce simulateur a été créé par
+ Retrouvez ce simulateur et bien d'autres sur
mon-entreprise.urssaf.fr
- Découvrez l'ensemble des simulateurs disponibles
ici
-
-
-
-
-
`
diff --git a/site/source/pages/Nouveautes/Nouveautes.tsx b/site/source/pages/Nouveautes/Nouveautes.tsx
index 200484572..fc013e680 100644
--- a/site/source/pages/Nouveautes/Nouveautes.tsx
+++ b/site/source/pages/Nouveautes/Nouveautes.tsx
@@ -107,7 +107,7 @@ export default function Nouveautés() {
-
+
)}
-
+
@@ -184,7 +184,7 @@ const Sidebar = styled.ul`
const SmallScreenSelect = styled.select``
-const MainBlock = styled.div`
+const SimulationGoals = styled.div`
flex: 1;
> h1:first-child,
diff --git a/site/source/pages/Simulateurs/ArtisteAuteur.tsx b/site/source/pages/Simulateurs/ArtisteAuteur.tsx
index 690957714..08b3584a8 100644
--- a/site/source/pages/Simulateurs/ArtisteAuteur.tsx
+++ b/site/source/pages/Simulateurs/ArtisteAuteur.tsx
@@ -4,7 +4,7 @@ import PeriodSwitch from 'Components/PeriodSwitch'
import SimulateurWarning from 'Components/SimulateurWarning'
import Simulation from 'Components/Simulation'
import { InstitutionsPartenairesArtisteAuteur } from 'Components/simulationExplanation/InstitutionsPartenaires'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import { EngineContext } from 'Components/utils/EngineContext'
import useSimulationConfig from 'Components/utils/useSimulationConfig'
import { H2 } from 'DesignSystem/typography/heading'
diff --git a/site/source/pages/Simulateurs/AutoEntrepreneur.tsx b/site/source/pages/Simulateurs/AutoEntrepreneur.tsx
index eedf7a110..9be04078c 100644
--- a/site/source/pages/Simulateurs/AutoEntrepreneur.tsx
+++ b/site/source/pages/Simulateurs/AutoEntrepreneur.tsx
@@ -4,7 +4,7 @@ import PeriodSwitch from 'Components/PeriodSwitch'
import SimulateurWarning from 'Components/SimulateurWarning'
import Simulation from 'Components/Simulation'
import { InstitutionsPartenairesAutoEntrepreneur } from 'Components/simulationExplanation/InstitutionsPartenaires'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import StackedBarChart from 'Components/StackedBarChart'
import { H2 } from 'DesignSystem/typography/heading'
import { useContext } from 'react'
diff --git a/site/source/pages/Simulateurs/ChômagePartiel.tsx b/site/source/pages/Simulateurs/ChômagePartiel.tsx
index 68447e8e2..443d3861a 100644
--- a/site/source/pages/Simulateurs/ChômagePartiel.tsx
+++ b/site/source/pages/Simulateurs/ChômagePartiel.tsx
@@ -1,6 +1,6 @@
import RuleLink from 'Components/RuleLink'
import Simulation from 'Components/Simulation'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import { FromTop } from 'Components/ui/animate'
import Warning from 'Components/ui/WarningBlock'
import { useIsEmbedded } from 'Components/utils/embeddedContext'
diff --git a/site/source/pages/Simulateurs/Dividendes.tsx b/site/source/pages/Simulateurs/Dividendes.tsx
index 5e7657c95..ce128afdb 100644
--- a/site/source/pages/Simulateurs/Dividendes.tsx
+++ b/site/source/pages/Simulateurs/Dividendes.tsx
@@ -3,7 +3,7 @@ import { HiddenOptionContext } from 'Components/conversation/ChoicesInput'
import { Condition } from 'Components/EngineValue'
import Notifications from 'Components/Notifications'
import Simulation from 'Components/Simulation'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import StackedBarChart from 'Components/StackedBarChart'
import Warning from 'Components/ui/WarningBlock'
import { useEngine } from 'Components/utils/EngineContext'
diff --git a/site/source/pages/Simulateurs/ImpôtSociété.tsx b/site/source/pages/Simulateurs/ImpôtSociété.tsx
index f0e21f78c..2d8f27039 100644
--- a/site/source/pages/Simulateurs/ImpôtSociété.tsx
+++ b/site/source/pages/Simulateurs/ImpôtSociété.tsx
@@ -2,7 +2,7 @@ import { updateSituation } from 'Actions/actions'
import RuleInput from 'Components/conversation/RuleInput'
import Value from 'Components/EngineValue'
import Notifications from 'Components/Notifications'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import { FromTop } from 'Components/ui/animate'
import Warning from 'Components/ui/WarningBlock'
import useSimulationConfig from 'Components/utils/useSimulationConfig'
diff --git a/site/source/pages/Simulateurs/Indépendant.tsx b/site/source/pages/Simulateurs/Indépendant.tsx
index 7c8018b28..4ea1cc40a 100644
--- a/site/source/pages/Simulateurs/Indépendant.tsx
+++ b/site/source/pages/Simulateurs/Indépendant.tsx
@@ -6,7 +6,7 @@ import PeriodSwitch from 'Components/PeriodSwitch'
import SimulateurWarning from 'Components/SimulateurWarning'
import Simulation from 'Components/Simulation'
import IndépendantExplanation from 'Components/simulationExplanation/IndépendantExplanation'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import { useEngine } from 'Components/utils/EngineContext'
import { SitePathsContext } from 'Components/utils/SitePathsContext'
import { Radio, ToggleGroup } from 'DesignSystem/field'
@@ -48,10 +48,11 @@ export default function IndépendantSimulation() {
+ <>
+
-
+ >
}
/>
@@ -66,15 +67,6 @@ export default function IndépendantSimulation() {
>
)
}
-const StyledToggleContainer = styled.div`
- display: flex;
- justify-content: space-between;
- flex-wrap: wrap-reverse;
- gap: ${({ theme }) => theme.spacings.md};
- @media (max-width: ${({ theme }) => theme.breakpointsWidth.md}) {
- justify-content: center;
- }
-`
function IndépendantSimulationGoals({
toggles = ,
diff --git a/site/source/pages/Simulateurs/SASU.tsx b/site/source/pages/Simulateurs/SASU.tsx
index b6eba0cb2..6f55e42fd 100644
--- a/site/source/pages/Simulateurs/SASU.tsx
+++ b/site/source/pages/Simulateurs/SASU.tsx
@@ -2,7 +2,7 @@ import PeriodSwitch from 'Components/PeriodSwitch'
import SimulateurWarning from 'Components/SimulateurWarning'
import Simulation from 'Components/Simulation'
import SalaryExplanation from 'Components/simulationExplanation/SalaryExplanation'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
export function SASUSimulation() {
return (
diff --git a/site/source/pages/Simulateurs/Salarié.tsx b/site/source/pages/Simulateurs/Salarié.tsx
index d1ec70eed..b31f7f04f 100644
--- a/site/source/pages/Simulateurs/Salarié.tsx
+++ b/site/source/pages/Simulateurs/Salarié.tsx
@@ -4,7 +4,7 @@ import PeriodSwitch from 'Components/PeriodSwitch'
import RuleLink from 'Components/RuleLink'
import Simulation from 'Components/Simulation'
import SalaryExplanation from 'Components/simulationExplanation/SalaryExplanation'
-import { SimulationGoal, SimulationGoals } from 'Components/SimulationGoals'
+import { SimulationGoal, SimulationGoals } from 'Components/Simulation'
import { FromTop } from 'Components/ui/animate'
import Emoji from 'Components/utils/Emoji'
import { useEngine } from 'Components/utils/EngineContext'