From 359446af891d7ac8d87c11f672d49719d3f38f12 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Mon, 4 Nov 2024 14:40:00 +0100
Subject: [PATCH] chore: fix profile colors & warning icon
---
.../MaxConsumptionCard/MaxConsumptionCard.tsx | 2 +-
.../__snapshots__/MaxConsumptionCard.spec.tsx.snap | 4 ++--
.../MaxConsumptionCard/maxConsumptionCard.scss | 4 ++++
.../ConnectionResult/ConnectionResult.tsx | 4 ++--
.../ConnectionResult/connectionResult.scss | 14 +++++---------
src/components/theme.ts | 5 -----
6 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx b/src/components/Analysis/MaxConsumptionCard/MaxConsumptionCard.tsx
index 9c821866b..bb5c7e26f 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 8844ebee0..20dc0de71 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 04fe44c71..8805a043d 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 a1b95d0cf..4318795d9 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 03d8e2c0f..60ccc5d7f 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 9b6840177..de0efa4bb 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)',
--
GitLab