diff --git a/src/frontend/apps/lti_site/apps/classroom/components/SelectContent/SelectContentTab/index.tsx b/src/frontend/apps/lti_site/apps/classroom/components/SelectContent/SelectContentTab/index.tsx
index 5c60f66aa5..ac26862d77 100644
--- a/src/frontend/apps/lti_site/apps/classroom/components/SelectContent/SelectContentTab/index.tsx
+++ b/src/frontend/apps/lti_site/apps/classroom/components/SelectContent/SelectContentTab/index.tsx
@@ -1,5 +1,6 @@
import { Tab } from 'grommet';
import { useCreateClassroom } from 'lib-classroom';
+import { colorsTokens } from 'lib-common';
import { ClassroomSVG } from 'lib-components';
import React from 'react';
import { useIntl } from 'react-intl';
@@ -76,7 +77,13 @@ const SelectContentTab = ({
}
+ icon={
+
+ }
label={intl.formatMessage(commonMessages.titleClassroom)}
/>
}
diff --git a/src/frontend/apps/lti_site/apps/deposit/components/Dashboard/index.tsx b/src/frontend/apps/lti_site/apps/deposit/components/Dashboard/index.tsx
index 5e4e9ff1ea..efbf912f2a 100644
--- a/src/frontend/apps/lti_site/apps/deposit/components/Dashboard/index.tsx
+++ b/src/frontend/apps/lti_site/apps/deposit/components/Dashboard/index.tsx
@@ -1,7 +1,6 @@
import { Loader } from '@openfun/cunningham-react';
import { ThemeContext, ThemeType } from 'grommet';
-import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens } from 'lib-common';
import { Box, UploadManager, useCurrentResourceContext } from 'lib-components';
import React, { Fragment } from 'react';
import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
@@ -41,7 +40,7 @@ const extendedTheme: ThemeType = {
font: {
family: 'Roboto-Bold',
},
- color: 'blue-active',
+ color: colorsTokens['info-500'],
level: {
1: {
medium: {
@@ -54,14 +53,14 @@ const extendedTheme: ThemeType = {
primary: {},
},
text: {
- extend: `color: ${normalizeColor('blue-active', theme)};`,
+ extend: `color: ${colorsTokens['info-500']};`,
},
paragraph: {
- extend: `color: ${normalizeColor('blue-active', theme)};`,
+ extend: `color: ${colorsTokens['info-500']};`,
},
pagination: {
button: {
- extend: `color: ${normalizeColor('blue-active', theme)};`,
+ extend: `color: ${colorsTokens['info-500']};`,
},
},
};
diff --git a/src/frontend/apps/lti_site/apps/deposit/components/SelectContent/SelectContentTab/index.tsx b/src/frontend/apps/lti_site/apps/deposit/components/SelectContent/SelectContentTab/index.tsx
index 2773567f19..2004a6cacf 100644
--- a/src/frontend/apps/lti_site/apps/deposit/components/SelectContent/SelectContentTab/index.tsx
+++ b/src/frontend/apps/lti_site/apps/deposit/components/SelectContent/SelectContentTab/index.tsx
@@ -1,5 +1,6 @@
import { Tab } from 'grommet';
import { DocumentStore } from 'grommet-icons';
+import { colorsTokens } from 'lib-common';
import React from 'react';
import { useIntl } from 'react-intl';
@@ -78,7 +79,11 @@ const SelectContentTab = ({
title={
+
}
label={intl.formatMessage(commonMessages.titleDeposit)}
/>
diff --git a/src/frontend/apps/lti_site/apps/markdown/components/SelectContent/SelectContentTab/index.tsx b/src/frontend/apps/lti_site/apps/markdown/components/SelectContent/SelectContentTab/index.tsx
index a98b0ace6b..ef48c61d57 100644
--- a/src/frontend/apps/lti_site/apps/markdown/components/SelectContent/SelectContentTab/index.tsx
+++ b/src/frontend/apps/lti_site/apps/markdown/components/SelectContent/SelectContentTab/index.tsx
@@ -1,5 +1,6 @@
import { Tab } from 'grommet';
import { TextWrap } from 'grommet-icons';
+import { colorsTokens } from 'lib-common';
import { useCreateMarkdownDocument } from 'lib-markdown';
import React from 'react';
import { useIntl } from 'react-intl';
@@ -78,7 +79,13 @@ const SelectContentTab = ({
}
+ icon={
+
+ }
label={intl.formatMessage(commonMessages.titleMarkdown)}
/>
}
diff --git a/src/frontend/apps/lti_site/components/PlaylistPortability/index.tsx b/src/frontend/apps/lti_site/components/PlaylistPortability/index.tsx
index ec0e16fed7..238ff0f9a1 100644
--- a/src/frontend/apps/lti_site/components/PlaylistPortability/index.tsx
+++ b/src/frontend/apps/lti_site/components/PlaylistPortability/index.tsx
@@ -1,5 +1,6 @@
import { Button, Input, Loader } from '@openfun/cunningham-react';
import { AddCircle, Trash } from 'grommet-icons';
+import { colorsTokens } from 'lib-common';
import {
Box,
BoxError,
@@ -240,7 +241,7 @@ export const PlaylistPortability = ({ object }: PlaylistPortabilityProps) => {
diff --git a/src/frontend/apps/lti_site/components/SelectContent/SelectContentTabs/index.tsx b/src/frontend/apps/lti_site/components/SelectContent/SelectContentTabs/index.tsx
index cb3de7ebf3..d34c84c0ab 100644
--- a/src/frontend/apps/lti_site/components/SelectContent/SelectContentTabs/index.tsx
+++ b/src/frontend/apps/lti_site/components/SelectContent/SelectContentTabs/index.tsx
@@ -1,7 +1,7 @@
import { Grommet, Tab, Tabs } from 'grommet';
import { deepMerge } from 'grommet/utils';
import { Document as DocumentIcon } from 'grommet-icons';
-import { theme as baseTheme } from 'lib-common';
+import { theme as baseTheme, colorsTokens } from 'lib-common';
import {
Box,
BoxLoader,
@@ -33,10 +33,10 @@ const customTheme = deepMerge(baseTheme, {
tab: {
active: {
background: 'bg-menu-hover',
- color: 'blue-active',
+ color: colorsTokens['info-500'],
},
border: undefined,
- color: 'blue-active',
+ color: colorsTokens['info-500'],
margin: 'none',
pad: '6px 12px',
extend: 'border-radius: 6px;',
@@ -157,7 +157,11 @@ export const SelectContentTabs = ({
title={
+
}
label={intl.formatMessage(commonMessages.titleWebinar)}
/>
@@ -185,7 +189,11 @@ export const SelectContentTabs = ({
title={
+
}
label={intl.formatMessage(commonMessages.titleVideo)}
/>
@@ -216,7 +224,7 @@ export const SelectContentTabs = ({
}
label={intl.formatMessage(commonMessages.titleDocument)}
diff --git a/src/frontend/apps/lti_site/components/UploadableObjectStatusBadge/index.tsx b/src/frontend/apps/lti_site/components/UploadableObjectStatusBadge/index.tsx
index b3d8b0e903..a2338c6f35 100644
--- a/src/frontend/apps/lti_site/components/UploadableObjectStatusBadge/index.tsx
+++ b/src/frontend/apps/lti_site/components/UploadableObjectStatusBadge/index.tsx
@@ -1,5 +1,5 @@
import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens, theme } from 'lib-common';
import {
UploadManagerStatus,
UploadableObject,
@@ -81,14 +81,14 @@ export const UploadableObjectStatusBadge = ({
case uploadState.DELETED:
case uploadState.PROCESSING:
return (
-
+
);
case uploadState.ERROR:
return (
-
+
);
@@ -98,7 +98,7 @@ export const UploadableObjectStatusBadge = ({
case UploadManagerStatus.INIT:
case UploadManagerStatus.UPLOADING:
return (
-
+
);
@@ -106,21 +106,21 @@ export const UploadableObjectStatusBadge = ({
case UploadManagerStatus.ERR_POLICY:
case UploadManagerStatus.ERR_UPLOAD:
return (
-
+
);
case UploadManagerStatus.ERR_SIZE:
return (
-
+
);
case UploadManagerStatus.SUCCESS:
return (
-
+
);
diff --git a/src/frontend/apps/standalone_site/src/features/Authentication/components/RenaterAuthenticator.tsx b/src/frontend/apps/standalone_site/src/features/Authentication/components/RenaterAuthenticator.tsx
index 558419fb94..205d0c4342 100644
--- a/src/frontend/apps/standalone_site/src/features/Authentication/components/RenaterAuthenticator.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Authentication/components/RenaterAuthenticator.tsx
@@ -104,7 +104,7 @@ export const RenaterAuthenticator = () => {
)}
}
- background="status-error"
+ background={colorsTokens['danger-400']}
width="full"
margin={{ bottom: 'small' }}
/>
@@ -116,7 +116,7 @@ export const RenaterAuthenticator = () => {
align="center"
gap="small"
>
-
+
{
{intl.formatMessage(messages.textConnectWith)}
-
+
diff --git a/src/frontend/apps/standalone_site/src/features/Contents/components/ContentsFilter/ContentsFilter.tsx b/src/frontend/apps/standalone_site/src/features/Contents/components/ContentsFilter/ContentsFilter.tsx
index 4141e0a496..cabb5f5e11 100644
--- a/src/frontend/apps/standalone_site/src/features/Contents/components/ContentsFilter/ContentsFilter.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Contents/components/ContentsFilter/ContentsFilter.tsx
@@ -1,5 +1,5 @@
import { Filter } from 'grommet-icons';
-import { Breakpoints } from 'lib-common';
+import { Breakpoints, colorsTokens } from 'lib-common';
import { Badge, Box, Playlist, Text, useResponsive } from 'lib-components';
import { Fragment, useEffect, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
@@ -127,7 +127,7 @@ const ContentsFilter = ({ setFilter, filter }: ContentsFilterProps) => {
}}
>
-
+
{intl.formatMessage(messages.labelFilter)}
{badgeCounter > 0 && (
diff --git a/src/frontend/apps/standalone_site/src/features/Contents/features/ClassRoom/components/Read/ClassRoomItem.tsx b/src/frontend/apps/standalone_site/src/features/Contents/features/ClassRoom/components/Read/ClassRoomItem.tsx
index 617cf79921..d298377dce 100644
--- a/src/frontend/apps/standalone_site/src/features/Contents/features/ClassRoom/components/Read/ClassRoomItem.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Contents/features/ClassRoom/components/Read/ClassRoomItem.tsx
@@ -1,5 +1,6 @@
import { Checkbox } from '@openfun/cunningham-react';
import { FormSchedule, InProgress } from 'grommet-icons';
+import { colorsTokens } from 'lib-common';
import {
Box,
ClassroomLite,
@@ -83,7 +84,7 @@ const ClassRoom = ({ classroom }: { classroom: ClassroomLite }) => {
{classroom.starting_at && (
-
+
{localDate(classroom.starting_at, intl.locale)}
@@ -91,14 +92,21 @@ const ClassRoom = ({ classroom }: { classroom: ClassroomLite }) => {
)}
{classroom.estimated_duration && (
-
+
{classroom.estimated_duration}
)}
-
+
{classroom.playlist.title}
diff --git a/src/frontend/apps/standalone_site/src/features/Contents/features/Live/components/Read/Live.tsx b/src/frontend/apps/standalone_site/src/features/Contents/features/Live/components/Read/Live.tsx
index 33e4c6c3e8..d2bb2274b0 100644
--- a/src/frontend/apps/standalone_site/src/features/Contents/features/Live/components/Read/Live.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Contents/features/Live/components/Read/Live.tsx
@@ -1,4 +1,5 @@
import { Checkbox } from '@openfun/cunningham-react';
+import { colorsTokens } from 'lib-common';
import { Box, ContentCard, StyledLink, Text, Video } from 'lib-components';
import { useEffect, useState } from 'react';
@@ -69,7 +70,11 @@ const Live = ({ live }: { live: Video }) => {
}
footer={
-
+
{live.playlist.title}
diff --git a/src/frontend/apps/standalone_site/src/features/Contents/features/Video/components/Read/Video.tsx b/src/frontend/apps/standalone_site/src/features/Contents/features/Video/components/Read/Video.tsx
index 1804b6b576..7e493e3589 100644
--- a/src/frontend/apps/standalone_site/src/features/Contents/features/Video/components/Read/Video.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Contents/features/Video/components/Read/Video.tsx
@@ -1,4 +1,5 @@
import { Checkbox } from '@openfun/cunningham-react';
+import { colorsTokens } from 'lib-common';
import {
Box,
ContentCard,
@@ -76,7 +77,11 @@ const Video = ({ video }: { video: IVideo }) => {
}
footer={
-
+
{video.playlist.title}
diff --git a/src/frontend/apps/standalone_site/src/features/Header/Header.tsx b/src/frontend/apps/standalone_site/src/features/Header/Header.tsx
index 9e94806aa9..ba85110333 100644
--- a/src/frontend/apps/standalone_site/src/features/Header/Header.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Header/Header.tsx
@@ -1,7 +1,6 @@
import { Button } from '@openfun/cunningham-react';
import { DropButton } from 'grommet';
-import { normalizeColor } from 'grommet/utils';
-import { Breakpoints, Nullable, theme } from 'lib-common';
+import { Breakpoints, Nullable, colorsTokens } from 'lib-common';
import {
AnonymousUser,
Box,
@@ -24,7 +23,7 @@ import { LanguagePicker } from 'features/Language/';
import { Burger } from 'features/Menu';
import { routes } from 'routes/routes';
-const colorMenu = normalizeColor('blue-active', theme);
+const colorMenu = colorsTokens['info-500'];
interface PropsExtended {
$isScrollTop: boolean;
@@ -42,7 +41,7 @@ const HeaderBox = styled(Box)`
background: #fff;
box-shadow: 1px 1px 20px #cce4f3;
`}
- z-index: 11;
+ z-index: 20;
height: auto;
`;
@@ -221,7 +220,7 @@ const Header = forwardRef>((_props, ref) => {
dropProps={{
round: 'xsmall',
border: {
- color: 'blue-active',
+ color: colorsTokens['info-500'],
size: '2px',
},
style: {
diff --git a/src/frontend/apps/standalone_site/src/features/Header/HeaderLight.tsx b/src/frontend/apps/standalone_site/src/features/Header/HeaderLight.tsx
index 0a449de4c5..d26c2b13ba 100644
--- a/src/frontend/apps/standalone_site/src/features/Header/HeaderLight.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Header/HeaderLight.tsx
@@ -1,6 +1,6 @@
import { Image } from 'grommet';
import { normalizeColor } from 'grommet/utils';
-import { Nullable, theme } from 'lib-common';
+import { Nullable, colorsTokens, theme } from 'lib-common';
import { Box, useSiteConfig } from 'lib-components';
import { forwardRef } from 'react';
import { Link } from 'react-router-dom';
@@ -63,7 +63,7 @@ export const HeaderLight = forwardRef<
ref={ref}
role="menubar"
pad="small"
- background={bgcolor || 'bg-marsha'}
+ background={bgcolor || colorsTokens['primary-100']}
>
{Logo}
diff --git a/src/frontend/apps/standalone_site/src/features/Menu/components/Menu.tsx b/src/frontend/apps/standalone_site/src/features/Menu/components/Menu.tsx
index a2087c9d60..2d8cd4584f 100644
--- a/src/frontend/apps/standalone_site/src/features/Menu/components/Menu.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Menu/components/Menu.tsx
@@ -1,5 +1,4 @@
-import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens } from 'lib-common';
import { Box, Text, useResponsive } from 'lib-components';
import { defineMessages, useIntl } from 'react-intl';
import styled from 'styled-components';
@@ -18,7 +17,7 @@ const messages = defineMessages({
},
});
-const colorMenu = normalizeColor('blue-active', theme);
+const colorMenu = colorsTokens['info-500'];
const sizeMenu = '18.75rem';
interface PropsExtended {
diff --git a/src/frontend/apps/standalone_site/src/features/Menu/components/MenuItem.tsx b/src/frontend/apps/standalone_site/src/features/Menu/components/MenuItem.tsx
index 289a3f42f4..13e3f30a07 100644
--- a/src/frontend/apps/standalone_site/src/features/Menu/components/MenuItem.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Menu/components/MenuItem.tsx
@@ -9,7 +9,7 @@ import { Route } from 'routes';
const NavLinkStyled = styled(NavLink)`
text-decoration: none;
- color: ${normalizeColor('blue-active', theme)};
+ color: ${colorsTokens['info-500']};
display: flex;
gap: 1rem;
align-items: center;
diff --git a/src/frontend/apps/standalone_site/src/features/PagesApi/components/PagesApi.tsx b/src/frontend/apps/standalone_site/src/features/PagesApi/components/PagesApi.tsx
index ae292cc3c5..fcaae59bcc 100644
--- a/src/frontend/apps/standalone_site/src/features/PagesApi/components/PagesApi.tsx
+++ b/src/frontend/apps/standalone_site/src/features/PagesApi/components/PagesApi.tsx
@@ -1,5 +1,4 @@
-import { normalizeColor } from 'grommet/utils';
-import { sizesTokens, theme } from 'lib-common';
+import { colorsTokens, sizesTokens } from 'lib-common';
import { Box, BoxLoader, Heading } from 'lib-components';
import ReactMarkdown from 'react-markdown';
import { useLocation } from 'react-router-dom';
@@ -12,7 +11,7 @@ const BoxMarkdown = styled(Box)`
color: #000;
}
& a {
- color: ${normalizeColor('blue-active', theme)};
+ color: ${colorsTokens['info-500']};
}
box-shadow: inset rgba(2, 117, 180, 0.3) 1px 1px 6px 0px;
& h1 {
diff --git a/src/frontend/apps/standalone_site/src/features/Playlist/features/UpdatePlaylist/components/UserListRow.tsx b/src/frontend/apps/standalone_site/src/features/Playlist/features/UpdatePlaylist/components/UserListRow.tsx
index 08a7ec9958..e9382f467f 100644
--- a/src/frontend/apps/standalone_site/src/features/Playlist/features/UpdatePlaylist/components/UserListRow.tsx
+++ b/src/frontend/apps/standalone_site/src/features/Playlist/features/UpdatePlaylist/components/UserListRow.tsx
@@ -1,4 +1,5 @@
import { Button, Select } from '@openfun/cunningham-react';
+import { colorsTokens } from 'lib-common';
import {
AnonymousUser,
BinSVG,
@@ -191,7 +192,7 @@ export const UserDeleteColumn = ({
aria-label={intl.formatMessage(messages.deleteUserLabel)}
icon={
diff --git a/src/frontend/apps/standalone_site/src/features/PortabilityRequests/components/PortabilityRequestStateTag.tsx b/src/frontend/apps/standalone_site/src/features/PortabilityRequests/components/PortabilityRequestStateTag.tsx
index bbb007bf99..dca3bd3157 100644
--- a/src/frontend/apps/standalone_site/src/features/PortabilityRequests/components/PortabilityRequestStateTag.tsx
+++ b/src/frontend/apps/standalone_site/src/features/PortabilityRequests/components/PortabilityRequestStateTag.tsx
@@ -1,13 +1,13 @@
import { Tag } from 'grommet';
import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens, theme } from 'lib-common';
import { PortabilityRequestState } from 'lib-components';
import { defineMessages, useIntl } from 'react-intl';
import styled from 'styled-components';
const NeutralStyledTag = styled(Tag)`
- color: ${normalizeColor('blue-active', theme)};
- border-color: ${normalizeColor('blue-active', theme)};
+ color: ${colorsTokens['info-500']};
+ border-color: ${colorsTokens['info-500']};
width: fit-content;
& > div {
width: 100%;
@@ -24,8 +24,8 @@ const StatusOkStyledTag = styled(Tag)`
`;
const StatusErrorStyledTag = styled(Tag)`
- color: ${normalizeColor('status-error', theme)};
- border-color: ${normalizeColor('status-error', theme)};
+ color: ${colorsTokens['danger-400']};
+ border-color: ${colorsTokens['danger-400']};
width: fit-content;
& > div {
width: 100%;
diff --git a/src/frontend/apps/standalone_site/src/styles/theme.extend.ts b/src/frontend/apps/standalone_site/src/styles/theme.extend.ts
index 9a48d33d2c..110ef49dc5 100644
--- a/src/frontend/apps/standalone_site/src/styles/theme.extend.ts
+++ b/src/frontend/apps/standalone_site/src/styles/theme.extend.ts
@@ -1,5 +1,5 @@
import { deepMerge } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens, theme } from 'lib-common';
import { css } from 'styled-components';
export const themeExtend = {
@@ -9,7 +9,7 @@ export const themeExtend = {
global: {
colors: {
text: {
- light: 'blue-active',
+ light: colorsTokens['info-500'],
},
},
elevation: {
diff --git a/src/frontend/packages/lib_classroom/src/components/ClassroomInfoBar/index.tsx b/src/frontend/packages/lib_classroom/src/components/ClassroomInfoBar/index.tsx
index 634e649f21..8413f5181f 100644
--- a/src/frontend/packages/lib_classroom/src/components/ClassroomInfoBar/index.tsx
+++ b/src/frontend/packages/lib_classroom/src/components/ClassroomInfoBar/index.tsx
@@ -1,6 +1,5 @@
import { Input } from '@openfun/cunningham-react';
-import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
+import { colorsTokens } from 'lib-common';
import { Box, BoxProps, EditionSVG, report } from 'lib-components';
import { useCallback, useEffect, useState } from 'react';
import toast from 'react-hot-toast';
@@ -108,8 +107,7 @@ export const ClassroomInfoBar = (props: BoxProps<'div'>) => {
diff --git a/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/Recordings/Recording/DeleteClassroomRecordingButton/index.tsx b/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/Recordings/Recording/DeleteClassroomRecordingButton/index.tsx
index e8b8ab4ad3..a6938145fc 100644
--- a/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/Recordings/Recording/DeleteClassroomRecordingButton/index.tsx
+++ b/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/Recordings/Recording/DeleteClassroomRecordingButton/index.tsx
@@ -1,3 +1,4 @@
+import { colorsTokens } from 'lib-common';
import {
BinSVG,
ButtonLoader,
@@ -103,7 +104,11 @@ export const DeleteClassroomRecordingButton = ({
isSubmitting={deleteClassroomRecording.isLoading}
color="tertiary"
>
-
+
);
diff --git a/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/SupportSharing/UploadDocuments/DocumentRow/index.tsx b/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/SupportSharing/UploadDocuments/DocumentRow/index.tsx
index b0e27c1a13..6c16b271c9 100644
--- a/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/SupportSharing/UploadDocuments/DocumentRow/index.tsx
+++ b/src/frontend/packages/lib_classroom/src/components/ClassroomWidgetProvider/widgets/SupportSharing/UploadDocuments/DocumentRow/index.tsx
@@ -1,5 +1,6 @@
import { Button } from '@openfun/cunningham-react';
import { Anchor } from 'grommet';
+import { colorsTokens } from 'lib-common';
import {
BinSVG,
Box,
@@ -128,7 +129,13 @@ export const DocumentRow = ({
aria-label={intl.formatMessage(messages.buttonLabel)}
onClick={() => setDeleteDocument()}
style={{ display: 'flex' }}
- icon={}
+ icon={
+
+ }
color="tertiary"
/>
@@ -167,7 +174,9 @@ export const DocumentRow = ({
}
icon={
diff --git a/src/frontend/packages/lib_classroom/src/components/DashboardClassroomForm/index.tsx b/src/frontend/packages/lib_classroom/src/components/DashboardClassroomForm/index.tsx
index 2545090e56..d79182bf50 100644
--- a/src/frontend/packages/lib_classroom/src/components/DashboardClassroomForm/index.tsx
+++ b/src/frontend/packages/lib_classroom/src/components/DashboardClassroomForm/index.tsx
@@ -53,7 +53,7 @@ const DashboardClassroomForm = ({ classroom }: DashboardClassroomFormProps) => {
},
},
tab: {
- extend: ` color:${normalizeColor('blue-active', theme)};\
+ extend: ` color:${colorsTokens['info-500']};\
font-family: 'Roboto-Bold';\
height: 21px;\
letter-spacing: -0.36px;\
@@ -84,7 +84,7 @@ const DashboardClassroomForm = ({ classroom }: DashboardClassroomFormProps) => {
return (
-
+
{intl.formatMessage(messages.addCalendar)}
diff --git a/src/frontend/packages/lib_components/src/common/Card/WhiteCard/index.tsx b/src/frontend/packages/lib_components/src/common/Card/WhiteCard/index.tsx
index 52d557ed63..45e96748fd 100644
--- a/src/frontend/packages/lib_components/src/common/Card/WhiteCard/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/Card/WhiteCard/index.tsx
@@ -17,7 +17,7 @@ export const WhiteCard = ({
return (
-
+
diff --git a/src/frontend/packages/lib_components/src/common/FoldableItem/index.tsx b/src/frontend/packages/lib_components/src/common/FoldableItem/index.tsx
index d50384e9f9..641c07fe24 100644
--- a/src/frontend/packages/lib_components/src/common/FoldableItem/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/FoldableItem/index.tsx
@@ -1,4 +1,5 @@
import { Collapsible } from 'grommet';
+import { colorsTokens } from 'lib-common';
import React, { useRef, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
@@ -57,7 +58,7 @@ export const FoldableItem = ({
{
if (!infoText) {
// this should not happen since button is disabled
@@ -84,7 +85,7 @@ export const FoldableItem = ({
transform: open ? undefined : 'rotate(-90deg)',
transition: '150ms linear all',
}}
- iconColor="blue-active"
+ iconColor={colorsTokens['info-500']}
height="9px"
width="14.5px"
/>
diff --git a/src/frontend/packages/lib_components/src/common/Modal/Modal.tsx b/src/frontend/packages/lib_components/src/common/Modal/Modal.tsx
index 59c9ebcdd3..3cee06711e 100644
--- a/src/frontend/packages/lib_components/src/common/Modal/Modal.tsx
+++ b/src/frontend/packages/lib_components/src/common/Modal/Modal.tsx
@@ -1,7 +1,6 @@
import { Layer, LayerProps } from 'grommet';
-import { normalizeColor } from 'grommet/utils';
import { FormClose } from 'grommet-icons';
-import { Nullable, theme } from 'lib-common';
+import { Nullable, colorsTokens } from 'lib-common';
import {
MutableRefObject,
PropsWithChildren,
@@ -26,7 +25,7 @@ const messages = defineMessages({
});
const FormCloseIcon = styled(FormClose)`
- background-color: ${normalizeColor('blue-active', theme)};
+ background-color: ${colorsTokens['info-500']};
border-radius: 100%;
align-self: end;
cursor: pointer;
diff --git a/src/frontend/packages/lib_components/src/common/SVGIcons/ClassroomSVG.tsx b/src/frontend/packages/lib_components/src/common/SVGIcons/ClassroomSVG.tsx
index e8ed344ccc..6c59e0385d 100644
--- a/src/frontend/packages/lib_components/src/common/SVGIcons/ClassroomSVG.tsx
+++ b/src/frontend/packages/lib_components/src/common/SVGIcons/ClassroomSVG.tsx
@@ -1,11 +1,6 @@
-import { normalizeColor } from 'grommet/utils';
-import { theme } from 'lib-common';
-import React from 'react';
-
import SVGIcon, { SvgProps } from '.';
export const ClassroomSVG = (svgProps: SvgProps) => {
- const color = normalizeColor(svgProps.iconColor, theme);
return (
@@ -13,7 +8,14 @@ export const ClassroomSVG = (svgProps: SvgProps) => {
d="M17.9636364,4.72727273 L6.03636365,4.72727273 C5.21636364,4.72727273 4.54545455,5.39818182 4.54545455,6.21818183 L4.54545455,15.1636364 C4.54545455,15.9836364 5.21636364,16.6545455 6.03636365,16.6545455 L17.9636364,16.6545455 C18.7836365,16.6545455 19.4545455,15.9836364 19.4545455,15.1636364 L19.4545455,6.21818183 C19.4545455,5.39818182 18.7836365,4.72727273 17.9636364,4.72727273 Z M10.1363637,12.6812728 L10.1363637,8.70054548 C10.1363637,8.11163638 10.7923637,7.7538182 11.2843637,8.07436366 L14.3780001,10.0647273 C14.8327273,10.3554546 14.8327273,11.0263637 14.3780001,11.3170909 L11.2843637,13.3074546 C10.7923637,13.6280001 10.1363637,13.2701819 10.1363637,12.6812728 Z"
id="Shape"
/>
-
+
);
diff --git a/src/frontend/packages/lib_components/src/common/SVGIcons/index.tsx b/src/frontend/packages/lib_components/src/common/SVGIcons/index.tsx
index 04b987d224..1becae70c7 100644
--- a/src/frontend/packages/lib_components/src/common/SVGIcons/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/SVGIcons/index.tsx
@@ -1,5 +1,4 @@
import { ThemeContext } from 'grommet';
-import { normalizeColor } from 'grommet/utils';
import React, { PropsWithChildren, SVGProps, useContext } from 'react';
import styled, { CSSProperties } from 'styled-components';
@@ -18,13 +17,12 @@ type StyledRectProps = RectInternalProps & ComponentWithTheme;
type StyledSVGProps = SVGInternalProps & ComponentWithTheme;
const StyledRect = styled.rect`
- fill: ${(props) =>
- normalizeColor(props.focusColor ?? 'none', props.grommetTheme)};
+ fill: ${({ focusColor }) => focusColor || 'none'};
`;
const StyledSVG = styled.svg`
path {
- fill: ${(props) => normalizeColor(props.iconColor, props.grommetTheme)};
+ fill: ${({ iconColor }) => iconColor};
}
`;
diff --git a/src/frontend/packages/lib_components/src/common/SchedulingFields/index.tsx b/src/frontend/packages/lib_components/src/common/SchedulingFields/index.tsx
index 8eeda8263b..0196a3e8ed 100644
--- a/src/frontend/packages/lib_components/src/common/SchedulingFields/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/SchedulingFields/index.tsx
@@ -1,7 +1,7 @@
import { DatePicker } from '@openfun/cunningham-react';
import { FormField, TextInput } from 'grommet';
import { MarginType } from 'grommet/utils';
-import { Nullable } from 'lib-common';
+import { Nullable, colorsTokens } from 'lib-common';
import { DateTime, Duration, Settings } from 'luxon';
import React, { useEffect, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
@@ -244,7 +244,7 @@ export const SchedulingFields = ({
label={intl.formatMessage(messages.startingAtTimeTextLabel)}
htmlFor="starting_at_time"
margin="none"
- background={startingAtError ? 'status-error-off' : 'white'}
+ background={startingAtError ? colorsTokens['danger-100'] : 'white'}
height="80%"
disabled={disabled}
>
diff --git a/src/frontend/packages/lib_components/src/common/UploadableObjectProgress/index.tsx b/src/frontend/packages/lib_components/src/common/UploadableObjectProgress/index.tsx
index f7340f5571..c2f9c7d308 100644
--- a/src/frontend/packages/lib_components/src/common/UploadableObjectProgress/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/UploadableObjectProgress/index.tsx
@@ -1,4 +1,5 @@
import { Meter, MeterProps } from 'grommet';
+import { colorsTokens } from 'lib-common';
import React from 'react';
import { defineMessages, useIntl } from 'react-intl';
import styled from 'styled-components';
@@ -30,7 +31,7 @@ export const UploadableObjectProgress = ({
// There is a conflict in the type of the `values` prop between `react` and `grommet`
// Use the const type to ensure correctness and the `any` escape hatch for the actual value
const values: MeterProps['values'] = [
- { color: 'brand', label: `${progress}%`, value: progress },
+ { color: colorsTokens['info-300'], label: `${progress}%`, value: progress },
];
return (
diff --git a/src/frontend/packages/lib_components/src/common/WidgetsContainer/index.tsx b/src/frontend/packages/lib_components/src/common/WidgetsContainer/index.tsx
index eaae6853ba..e82c30af19 100644
--- a/src/frontend/packages/lib_components/src/common/WidgetsContainer/index.tsx
+++ b/src/frontend/packages/lib_components/src/common/WidgetsContainer/index.tsx
@@ -77,7 +77,11 @@ export const WidgetsContainer = ({ children }: WidgetsContainerProps) => {
? children
.filter((widget) => widget.size === WidgetSize.LARGE)
.map((widget, index) => (
-
+
{widget.component}
))
@@ -88,7 +92,7 @@ export const WidgetsContainer = ({ children }: WidgetsContainerProps) => {
{mapper.map((_, indexColumn) => (
diff --git a/src/frontend/packages/lib_components/src/utils/useResizer.tsx b/src/frontend/packages/lib_components/src/utils/useResizer.tsx
index 5b092c475a..54a9c4298e 100644
--- a/src/frontend/packages/lib_components/src/utils/useResizer.tsx
+++ b/src/frontend/packages/lib_components/src/utils/useResizer.tsx
@@ -1,5 +1,4 @@
-import { normalizeColor } from 'grommet/utils';
-import { Nullable, theme } from 'lib-common';
+import { Nullable, colorsTokens } from 'lib-common';
import React, {
CSSProperties,
PropsWithChildren,
@@ -21,7 +20,7 @@ const StyledResizeSeparator = styled(Box)`
cursor: col-resize;
&:hover div {
- background-color: ${normalizeColor('blue-active', theme)};
+ background-color: ${colorsTokens['info-500']};
}
`;
diff --git a/src/frontend/packages/lib_markdown/src/components/MarkdownEditor/index.tsx b/src/frontend/packages/lib_markdown/src/components/MarkdownEditor/index.tsx
index 33cb24ff30..79402ef25b 100644
--- a/src/frontend/packages/lib_markdown/src/components/MarkdownEditor/index.tsx
+++ b/src/frontend/packages/lib_markdown/src/components/MarkdownEditor/index.tsx
@@ -347,7 +347,7 @@ export const MarkdownEditor = ({ markdownDocumentId }: MarkdownEditorProps) => {
/>
-