Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Theme] Mise à jour des couleurs #2541

Merged
merged 2 commits into from
Sep 26, 2023
Merged

[Theme] Mise à jour des couleurs #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa7c29
[Theme] update colors with new monitor-ui version
claire2212 Sep 25, 2023
97971e7
[Theme] delete useless colors in local theme
claire2212 Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@dnd-kit/core": "6.0.8",
"@dnd-kit/modifiers": "6.0.1",
"@mtes-mct/monitor-ui": "9.4.0",
"@mtes-mct/monitor-ui": "10.0.0",
"@reduxjs/toolkit": "1.9.6",
"@sentry/browser": "7.55.2",
"@sentry/react": "7.52.1",
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/features/Backoffice/menu/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// TODO Remove temporary `as any` and `@ts-ignore` (fresh migration to TS).

import { THEME } from '@mtes-mct/monitor-ui'
import { Link, useMatch } from 'react-router-dom'
import styled from 'styled-components'

import { COLORS } from '../../../constants/constants'
import { theme } from '../../../ui/theme'
import { ReactComponent as LayersSVG } from '../../icons/Couches.svg'
import { ReactComponent as FleetSVG } from '../../icons/Label_segment_de_flotte_white.svg'
import { ReactComponent as ControlObjectivesSVG } from '../../icons/objectifs_controle.svg'
Expand All @@ -19,7 +19,7 @@ export function Menu() {
<Title>Backoffice</Title>
<MenuLink
style={{
background: onRegulationPage ? theme.color.blueGray[100] : 'none'
background: onRegulationPage ? THEME.color.blueGray : 'none'
}}
title="Zones réglementaires"
to="/backoffice/regulation"
Expand All @@ -32,7 +32,7 @@ export function Menu() {
</MenuLink>
<MenuLink
style={{
background: onControlObjectivePage ? theme.color.blueGray[100] : 'none'
background: onControlObjectivePage ? THEME.color.blueGray : 'none'
}}
title="Objectifs de contrôle"
to="/backoffice/control_objectives"
Expand All @@ -45,7 +45,7 @@ export function Menu() {
</MenuLink>
<MenuLink
style={{
background: onFleetSegmentsPage ? theme.color.blueGray[100] : 'none'
background: onFleetSegmentsPage ? THEME.color.blueGray : 'none'
}}
title="Segments de flotte"
to="/backoffice/fleet_segments"
Expand Down
Loading
Loading