diff --git a/src/components/Root.tsx b/src/components/Root.tsx index 8d8c2b3b..c3ddddcc 100644 --- a/src/components/Root.tsx +++ b/src/components/Root.tsx @@ -60,10 +60,14 @@ const theme = createTheme({ }, typography: { h2: { - fontSize: '2rem', + fontSize: '1.5rem', }, h3: { - fontSize: '1.8rem', + fontSize: '1.2rem', + fontWeight: 'bold', + }, + h4: { + fontSize: '1.2rem', }, }, status: { diff --git a/src/components/main/tasks/TasksList.tsx b/src/components/main/tasks/TasksList.tsx index 3f814505..d220506f 100644 --- a/src/components/main/tasks/TasksList.tsx +++ b/src/components/main/tasks/TasksList.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'; import { Button } from '@graasp/ui'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; -import { useTheme } from '@mui/material'; +import { styled, useTheme } from '@mui/material'; import Paper from '@mui/material/Paper'; import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; @@ -20,6 +20,10 @@ import AddTask from './AddTask'; import DraggableTask from './DraggableTask'; import TasksListTitle from './TasksListTitle'; +const FullHeightStack = styled(Stack)(() => ({ + height: '100%', +})); + type TasksListProps = { title: string; tasks: List; @@ -70,10 +74,11 @@ const TasksList: FC = ({ position: 'relative', zIndex: 1, boxShadow: isOver ? `0 0 1em ${theme.palette.primary.light}` : 'none', + maxWidth: '40em', }} key={label} > - + - + {addComponent && } {tasks.size ? ( tasks.map((task: ExistingTaskType, key: number) => ( @@ -101,8 +110,8 @@ const TasksList: FC = ({ {t('NO_TASKS', { title })} )} - - + + ); }; diff --git a/src/components/main/tasks/TasksListMinimized.tsx b/src/components/main/tasks/TasksListMinimized.tsx index 1c37b762..863f7ccb 100644 --- a/src/components/main/tasks/TasksListMinimized.tsx +++ b/src/components/main/tasks/TasksListMinimized.tsx @@ -1,31 +1,30 @@ -import { List } from 'immutable'; - import React, { forwardRef } from 'react'; import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; +import { Badge } from '@mui/material'; import Button from '@mui/material/Button'; - -import { ExistingTaskType } from '../../../config/appDataTypes'; -import TasksListTitle from './TasksListTitle'; +import Typography from '@mui/material/Typography'; type TasksListMinimizedProps = { title: string; - tasks: List; + tasksNumber?: number; onShow: () => void; }; const TasksListMinimized = forwardRef< HTMLButtonElement, TasksListMinimizedProps ->(({ title, tasks, onShow }, ref) => ( +>(({ title, tasksNumber = 0, onShow }, ref) => ( )); diff --git a/src/components/views/TasksManager.tsx b/src/components/views/TasksManager.tsx index 81c6764b..c7465b96 100644 --- a/src/components/views/TasksManager.tsx +++ b/src/components/views/TasksManager.tsx @@ -60,6 +60,13 @@ const TasksManager: FC = () => { [TASK_LABELS.COMPLETED]: false, }); + const numberOfColumnsInGridForVisibleList = + 12 / + Object.values(hiddenLists).reduce( + (total, x) => (x === false ? total + 1 : total), + 0, + ); + const [activeTask, setActiveTask] = useState(null); const filteredMembersSetting = appSettingArray.find( @@ -182,7 +189,12 @@ const TasksManager: FC = () => { unmountOnExit style={{ height: 'auto' }} > - + { > handleHide(label, false)} />