diff --git a/merged_tokens.json b/merged_tokens.json index ee1ebc99d..0d4de40e1 100644 --- a/merged_tokens.json +++ b/merged_tokens.json @@ -6940,7 +6940,12 @@ }, "typo": { "lg": { - "value": "{global.content.typo.body.lg--medium}", + "value": { + "fontFamily": "{core.font.family.main}", + "fontWeight": "{core.font.weight.medium}", + "lineHeight": "19 px", + "fontSize": "{core.font.size.100}" + }, "type": "typography" }, "md": { @@ -7257,7 +7262,12 @@ }, "typo": { "lg": { - "value": "{global.content.typo.body.lg--medium}", + "value": { + "fontFamily": "{core.font.family.main}", + "fontWeight": "{core.font.weight.medium}", + "lineHeight": "19 px", + "fontSize": "{core.font.size.100}px" + }, "type": "typography" }, "md": { @@ -7454,7 +7464,12 @@ }, "typo": { "lg": { - "value": "{global.content.typo.body.lg--medium}", + "value": { + "fontFamily": "{core.font.family.main}", + "fontWeight": "{core.font.weight.medium}", + "lineHeight": "19 px", + "fontSize": "{core.font.size.100}px" + }, "type": "typography" }, "md": { diff --git a/packages/components/src/informative/Kanban/Kanban.styles.js b/packages/components/src/informative/Kanban/Kanban.styles.js index 2217c437b..55552c0f4 100644 --- a/packages/components/src/informative/Kanban/Kanban.styles.js +++ b/packages/components/src/informative/Kanban/Kanban.styles.js @@ -1,5 +1,4 @@ import { createStyles } from '@mantine/styles'; -import { getFontProductive } from '../../theme.mixins'; export const KanbanStyles = createStyles((theme, {}) => { return { @@ -9,9 +8,9 @@ export const KanbanStyles = createStyles((theme, {}) => { height: '100%', maxHeight: '100%', padding: theme.spacing[2], - backgroundColor: '#EDEFF5', + backgroundColor: '#F8F9FB', gap: theme.spacing[2], - display: 'flex' + display: 'flex', }, column: { height: '100%', @@ -20,29 +19,31 @@ export const KanbanStyles = createStyles((theme, {}) => { width: '300px', minWidth: '300px', flexDirection: 'column', - backgroundColor: 'rgba(255, 255, 255, 0.3)', - borderRadius: theme.spacing[1] + backgroundColor: '#F2F4F8', + borderRadius: theme.spacing[1], }, columnHeader: { paddingLeft: theme.spacing[4], paddingRight: theme.spacing[4], paddingTop: theme.spacing[3], - marginBottom: theme.spacing[4], - color: theme.colors.text05, - ...getFontProductive(theme.fontSizes['2'], 500), + color: '#4D5358', + fontSize: '16px', + fontWeight: 600, + lineHeight: '24px', + fontFamily: 'Albert Sans', display: 'flex', - justifyContent: 'space-between', - alignItems: 'center' + gap: theme.spacing[2], + alignItems: 'center', }, scroll: { - padding: theme.spacing[2] + padding: theme.spacing[2], }, listDraggingOver: { backgroundColor: '#EDEFF5', - borderRadius: 4 + borderRadius: 4, }, list: { - minHeight: '100px' + minHeight: '100px', }, iconBig: { position: 'absolute', @@ -50,8 +51,8 @@ export const KanbanStyles = createStyles((theme, {}) => { left: 20, zIndex: 0, img: { - filter: 'brightness(0) invert(1)' - } - } + filter: 'brightness(0) invert(1)', + }, + }, }; }); diff --git a/packages/components/src/informative/Kanban/components/Column.js b/packages/components/src/informative/Kanban/components/Column.js index f9b2a556f..f465f5129 100644 --- a/packages/components/src/informative/Kanban/components/Column.js +++ b/packages/components/src/informative/Kanban/components/Column.js @@ -3,7 +3,6 @@ import { Box } from '../../../layout/Box'; import { KanbanStyles } from '../Kanban.styles'; import { Draggable } from 'react-beautiful-dnd'; import { QuoteList } from './QuoteList'; -import { Text } from '../../../typography'; import { ImageLoader } from '../../../misc'; import { ScrollArea } from '@mantine/core'; @@ -28,11 +27,9 @@ const Column = ({ value, index, isScrollable, isCombineEnabled, itemRender, icon ) : null} - - {value.title} - + {value.title} - {value.cards.length} + {value.cards.length} { - const { classes } = ProgressColorBarStyles(); - + const { classes, theme } = ProgressColorBarStyles(); + if (value < 25) { + color = theme.other.progress.content.color.phatic.negative; + } else if (value < 75) { + color = theme.other.progress.content.color.phatic.attention; + } else { + color = theme.other.progress.content.color.phatic.positive; + } return ( {labelLeft && labelRight && ( diff --git a/packages/components/src/informative/ProgressColorBar/ProgressColorBar.styles.js b/packages/components/src/informative/ProgressColorBar/ProgressColorBar.styles.js index f7c215291..53b07a717 100644 --- a/packages/components/src/informative/ProgressColorBar/ProgressColorBar.styles.js +++ b/packages/components/src/informative/ProgressColorBar/ProgressColorBar.styles.js @@ -1,16 +1,18 @@ import { createStyles } from '@mantine/styles'; import { pxToRem } from '../../theme.mixins'; -export const ProgressColorBarStyles = createStyles((theme) => ({ - topLabelsContainer: { - display: 'flex', - justifyContent: 'space-between', - marginBottom: pxToRem(8), - }, - labels: { - color: theme.other.progress.content.color.text, - ...theme.other.progress.content.typo, - }, -})); +export const ProgressColorBarStyles = createStyles((theme) => { + return { + topLabelsContainer: { + display: 'flex', + justifyContent: 'space-between', + marginBottom: pxToRem(8), + }, + labels: { + color: theme.other.progress.content.color.text, + ...theme.other.progress.content.typo, + }, + }; +}); export default ProgressColorBarStyles; diff --git a/packages/components/src/tokens.compiled.js b/packages/components/src/tokens.compiled.js index ed85821ec..ad11f90d1 100644 --- a/packages/components/src/tokens.compiled.js +++ b/packages/components/src/tokens.compiled.js @@ -1153,7 +1153,7 @@ export default { "y": 0, "blur": 4, "spread": 0, - "color": "#ffffff", + "color": "#ffffff26", "type": "dropShadow" }, "type": "boxShadow" @@ -1234,17 +1234,8 @@ export default { "type": "color" }, "hover--reverse-transparent": { - "value": "#ffffff", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.15", - "space": "lch" - } - } - } + "value": "#ffffff26", + "type": "color" }, "down": { "value": "#F1FFBD", @@ -4939,30 +4930,12 @@ export default { "color": { "primary": { "default": { - "value": "#4D5358", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.4", - "space": "lch" - } - } - } + "value": "#4d535866", + "type": "color" }, "hover": { - "value": "#4D5358", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.7", - "space": "lch" - } - } - } + "value": "#4d5358b3", + "type": "color" }, "down": { "value": "#4D5358", @@ -5095,8 +5068,8 @@ export default { "value": { "fontFamily": "Albert Sans", "fontWeight": 500, - "lineHeight": "24px", - "fontSize": "18px" + "lineHeight": "19 px", + "fontSize": 16 }, "type": "typography" }, @@ -5451,8 +5424,8 @@ export default { "value": { "fontFamily": "Albert Sans", "fontWeight": 500, - "lineHeight": "24px", - "fontSize": "18px" + "lineHeight": "19 px", + "fontSize": "16px" }, "type": "typography" }, @@ -5677,8 +5650,8 @@ export default { "value": { "fontFamily": "Albert Sans", "fontWeight": 500, - "lineHeight": "24px", - "fontSize": "18px" + "lineHeight": "19 px", + "fontSize": "16px" }, "type": "typography" }, diff --git a/packages/icons/optimized/outline/meeting-camera.svg b/packages/icons/optimized/outline/meeting-camera.svg index 44c7814b4..2b35634bd 100644 --- a/packages/icons/optimized/outline/meeting-camera.svg +++ b/packages/icons/optimized/outline/meeting-camera.svg @@ -1,3 +1,3 @@ -