diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx index 9c821866b69fc8ccdc2c6b8e287c7dfbc450facd..bb5c7e26f3efb7f21d312786311a7685a534906d 100644 --- a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx +++ b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx @@ -169,7 +169,7 @@ const FluidMaxButton = ({ /> <div - className={classNames('text-14-normal', { + className={classNames('text-14-normal fluidLabel', { active: isActive, })} > diff --git a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap index 8844ebee0309f501048319c58f437937c3cf2cf0..20dc0de7175ad37086447ad652b72bc5e00d3ace 100644 --- a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap +++ b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap @@ -34,7 +34,7 @@ exports[`MaxConsumptionCard component should be rendered correctly with 2 button /> </svg> <div - class="text-14-normal active" + class="text-14-normal fluidLabel active" > FLUID.ELECTRICITY.LABEL </div> @@ -63,7 +63,7 @@ exports[`MaxConsumptionCard component should be rendered correctly with 2 button /> </svg> <div - class="text-14-normal" + class="text-14-normal fluidLabel" > FLUID.GAS.LABEL </div> diff --git a/src/components/Analysis/MaxConsumptionCard/maxConsumptionCard.scss b/src/components/Analysis/MaxConsumptionCard/maxConsumptionCard.scss index 04fe44c717619c26a0807c1c5a4ab9e42b7e1028..8805a043dce1032d51e4b9321d8bfb3fa0354bf7 100644 --- a/src/components/Analysis/MaxConsumptionCard/maxConsumptionCard.scss +++ b/src/components/Analysis/MaxConsumptionCard/maxConsumptionCard.scss @@ -75,5 +75,9 @@ display: flex; flex-direction: column; gap: 4px; + + .fluidLabel { + color: $white; + } } } diff --git a/src/components/Konnector/ConnectionResult/ConnectionResult.tsx b/src/components/Konnector/ConnectionResult/ConnectionResult.tsx index a1b95d0cfdc767b0b17b2b059ad345562a52b7e2..4318795d92ddd1f760f25f31cebe119fd486c6ee 100644 --- a/src/components/Konnector/ConnectionResult/ConnectionResult.tsx +++ b/src/components/Konnector/ConnectionResult/ConnectionResult.tsx @@ -1,5 +1,5 @@ import Button from '@material-ui/core/Button' -import warningDark from 'assets/icons/ico/warning-dark.svg' +import warningOrange from 'assets/icons/ico/warn-orange.svg' import warningRed from 'assets/icons/ico/warning-red.svg' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import { useClient } from 'cozy-client' @@ -346,7 +346,7 @@ const DisplayManualUpdate = () => { return ( <div className="connection-caption-warning connection-update-errored warning-white text-16-normal"> <StyledIcon - icon={warningDark} + icon={warningOrange} size={36} className="warning-icon" role="img" diff --git a/src/components/Konnector/ConnectionResult/connectionResult.scss b/src/components/Konnector/ConnectionResult/connectionResult.scss index 03d8e2c0f077daebe4974975fb93c88a3fa50049..60ccc5d7f65017ea0dd81ede2805d1035e57601d 100644 --- a/src/components/Konnector/ConnectionResult/connectionResult.scss +++ b/src/components/Konnector/ConnectionResult/connectionResult.scss @@ -24,16 +24,12 @@ } } .connection-caption-warning { - background-color: $gold-shadow; - margin: 0 -2.5rem; - padding: 0.4rem 2.5rem; + background-color: #3a2f23; + border-radius: 4px; + padding: 8px; display: flex; align-items: center; - color: $dark-2; - @media #{$tablet} { - margin: 0 -1.2rem; - padding: 0.4rem 1.2rem; - } + color: $white; .warning-icon { min-width: 20px; @@ -44,7 +40,7 @@ } } .connection-caption { - color: $grey-bright; + color: $white; } } diff --git a/src/components/theme.ts b/src/components/theme.ts index 9b6840177093a90ad632d6b0989bf7ccf76edcd2..de0efa4bb87595f191576296811e96e1112985ff 100644 --- a/src/components/theme.ts +++ b/src/components/theme.ts @@ -63,11 +63,6 @@ export const theme = createTheme({ boxSizing: 'border-box', }, }, - MuiIconButton: { - root: { - color: 'inherit !important', - }, - }, MuiAccordion: { root: { boxShadow: ' 0px 4px 16px 0px rgba(0, 0, 0, 0.12)',