diff --git a/site/source/components/SchemeComparaison.tsx b/site/source/components/SchemeComparaison.tsx index 5862afc63..edff3ce47 100644 --- a/site/source/components/SchemeComparaison.tsx +++ b/site/source/components/SchemeComparaison.tsx @@ -474,7 +474,7 @@ export const StyledGrid = styled.div` & > .green { font-weight: bold; - color: limegreen; + color: green; background-color: inherit; } diff --git a/site/source/components/charts/PagesCharts.tsx b/site/source/components/charts/PagesCharts.tsx index f16a4043b..16d5de48c 100644 --- a/site/source/components/charts/PagesCharts.tsx +++ b/site/source/components/charts/PagesCharts.tsx @@ -85,14 +85,14 @@ export default function PagesChart({ data, sync = true }: PagesChartProps) { textAnchor="end" height={60} minTickGap={-8} - stroke={darkMode ? 'lightGrey' : 'darkGray'} + stroke={darkMode ? 'lightGrey' : 'gray'} /> formatValue(x)} domain={['0', 'auto']} type="number" - stroke={darkMode ? 'lightGrey' : 'darkGray'} + stroke={darkMode ? 'lightGrey' : 'gray'} /> } /> diff --git a/site/source/design-system/card/Card.tsx b/site/source/design-system/card/Card.tsx index 0bf8e6869..2cbf3d480 100644 --- a/site/source/design-system/card/Card.tsx +++ b/site/source/design-system/card/Card.tsx @@ -136,7 +136,7 @@ export const CardContainer = styled.div<{ cursor: ${({ $inert }) => ($inert ? 'auto' : 'pointer')}; flex-direction: column; align-items: center; - border: none; + border: solid 1px ${({ theme }) => theme.colors.extended.grey[300]}; background-color: ${({ theme, $inert }) => theme.darkMode ? theme.colors.extended.dark[$inert ? 700 : 600] diff --git a/site/source/design-system/field/TextField.tsx b/site/source/design-system/field/TextField.tsx index 36166ffb9..c8180e438 100644 --- a/site/source/design-system/field/TextField.tsx +++ b/site/source/design-system/field/TextField.tsx @@ -70,10 +70,10 @@ export const StyledInput = styled.input` ${({ theme }) => theme.darkMode && css` - opacity: 0.6; + opacity: 1; `} color: ${({ theme }) => - theme.colors.extended.grey[theme.darkMode ? 200 : 600]}; + theme.colors.extended.grey[theme.darkMode ? 200 : 600]}!important; background-color: transparent; } ${({ theme }) => @@ -144,7 +144,7 @@ export const StyledInputContainer = styled.div<{ display: flex; background-color: ${({ theme }) => theme.darkMode - ? 'rgba(255, 255, 255, 20%)' + ? 'rgba(255, 255, 255, 10%)' : theme.colors.extended.grey[100]}; align-items: center; transition: all 0.2s; diff --git a/site/source/design-system/switch/Switch.tsx b/site/source/design-system/switch/Switch.tsx index 4929563d7..2d4563095 100644 --- a/site/source/design-system/switch/Switch.tsx +++ b/site/source/design-system/switch/Switch.tsx @@ -45,7 +45,7 @@ const StyledSwitch = styled.span` background-color: ${({ theme, checked }) => checked ? theme.colors.bases.primary[700] - : theme.colors.extended.grey[500]}; + : theme.colors.extended.grey[600]}; color: inherit; font-family: ${({ theme }) => theme.fonts.main}; padding: 0.2rem; diff --git a/site/source/pages/assistants/choix-du-statut/AfterRegistration.tsx b/site/source/pages/assistants/choix-du-statut/AfterRegistration.tsx index c47171c9a..037084c11 100644 --- a/site/source/pages/assistants/choix-du-statut/AfterRegistration.tsx +++ b/site/source/pages/assistants/choix-du-statut/AfterRegistration.tsx @@ -11,7 +11,7 @@ import { Body } from '@/design-system/typography/paragraphs' import { useSitePaths } from '@/sitePaths' import { RootState } from '@/store/reducers/rootReducer' -import siret from './siret.jpg' +import siret from './siret.png' export default function AfterRegistration() { const { absoluteSitePaths } = useSitePaths() @@ -60,7 +60,11 @@ export default function AfterRegistration() { d'établissement (NIC).
- +

Le code APE diff --git a/site/source/pages/assistants/choix-du-statut/GuideStatut/PreviousAnswers.tsx b/site/source/pages/assistants/choix-du-statut/GuideStatut/PreviousAnswers.tsx index 63ee43d2c..25dd10680 100644 --- a/site/source/pages/assistants/choix-du-statut/GuideStatut/PreviousAnswers.tsx +++ b/site/source/pages/assistants/choix-du-statut/GuideStatut/PreviousAnswers.tsx @@ -1,5 +1,6 @@ import { Trans, useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' +import { useLocation } from 'react-router-dom' import styled from 'styled-components' import { Link } from '@/design-system/typography/link' @@ -70,6 +71,7 @@ const PreviousAnswersItem = styled.li` ` export default function PreviousAnswers() { + const location = useLocation() const { absoluteSitePaths } = useSitePaths() const legalStatus = useSelector( (state: RootState) => state.choixStatutJuridique.companyLegalStatus @@ -88,6 +90,11 @@ export default function PreviousAnswers() { key as keyof LegalStatusRequirements, value as string ) + const isCurrent = + decodeURI(location.pathname) === + absoluteSitePaths.assistants['choix-du-statut'].guideStatut[ + key as keyof typeof legalStatus + ] return ( value !== undefined && ( @@ -103,6 +110,11 @@ export default function PreviousAnswers() { (textObject as RequirementToTextType)?.props?.children || '', })} + style={ + isCurrent + ? { textDecoration: 'underline' } + : { textDecoration: 'none' } + } > {textObject} diff --git a/site/source/pages/assistants/choix-du-statut/siret.png b/site/source/pages/assistants/choix-du-statut/siret.png new file mode 100644 index 000000000..2e1c195e1 Binary files /dev/null and b/site/source/pages/assistants/choix-du-statut/siret.png differ diff --git a/site/source/pages/statistiques/Chart.tsx b/site/source/pages/statistiques/Chart.tsx index 755ba5c72..c2fdfbbc7 100644 --- a/site/source/pages/statistiques/Chart.tsx +++ b/site/source/pages/statistiques/Chart.tsx @@ -142,13 +142,13 @@ export default function VisitsChart({ textAnchor="end" height={60} minTickGap={-8} - stroke={darkMode ? 'lightGrey' : 'darkGray'} + stroke={darkMode ? 'lightGrey' : 'gray'} /> formatValue(val) as string} type="number" - stroke={darkMode ? 'lightGrey' : 'darkGray'} + stroke={darkMode ? 'lightGrey' : 'gray'} /> } />