diff --git a/src/app/deals/components/desktop/Board/Board.module.css b/src/app/deals/components/desktop/Board/Board.module.css index 9b74015..e65c632 100644 --- a/src/app/deals/components/desktop/Board/Board.module.css +++ b/src/app/deals/components/desktop/Board/Board.module.css @@ -3,5 +3,5 @@ min-width: 130px; flex-wrap: nowrap; gap: 3px; -} +} diff --git a/src/app/deals/components/desktop/Board/Board.tsx b/src/app/deals/components/desktop/Board/Board.tsx index c9abc7e..52901fc 100644 --- a/src/app/deals/components/desktop/Board/Board.tsx +++ b/src/app/deals/components/desktop/Board/Board.tsx @@ -1,11 +1,11 @@ import React, { FC, useState } from "react"; import { Box, Flex, Group, Text } from "@mantine/core"; -import styles from "@/app/deals/components/desktop/Board/Board.module.css"; import BoardMenu from "@/app/deals/components/shared/BoardMenu/BoardMenu"; import { useBoardsContext } from "@/app/deals/contexts/BoardsContext"; import SmallPageBlock from "@/components/layout/SmallPageBlock/SmallPageBlock"; import InPlaceInput from "@/components/ui/InPlaceInput/InPlaceInput"; import { BoardSchema } from "@/lib/client"; +import styles from "./Board.module.css"; type Props = { board: BoardSchema; @@ -13,12 +13,18 @@ type Props = { const Board: FC = ({ board }) => { const { selectedBoard } = useBoardsContext(); + const isSelected = selectedBoard?.id === board.id; const [isHovered, setIsHovered] = useState(false); const { onUpdateBoard } = useBoardsContext(); return ( - - + + { renderItem={renderBoard} onDragEnd={onDragEnd} onItemClick={selectBoard} - containerStyle={{ flexWrap: "nowrap" }} + containerStyle={{ + flexWrap: "nowrap", + gap: "var(--mantine-spacing-md)", + margin: "var(--mantine-spacing-md)", + }} dragHandleStyle={{ cursor: "pointer" }} disabled={isMobile} /> diff --git a/src/app/deals/components/desktop/CreateBoardButton/CreateBoardButton.tsx b/src/app/deals/components/desktop/CreateBoardButton/CreateBoardButton.tsx index e2ee066..cf4a234 100644 --- a/src/app/deals/components/desktop/CreateBoardButton/CreateBoardButton.tsx +++ b/src/app/deals/components/desktop/CreateBoardButton/CreateBoardButton.tsx @@ -14,7 +14,7 @@ const CreateBoardButton = () => { onComplete={onCreateBoard} getChildren={startEditing => ( @@ -22,6 +22,7 @@ const CreateBoardButton = () => { modalTitle={"Создание доски"} inputStyles={{ wrapper: { + padding: 4, marginLeft: 15, marginRight: 15, }, diff --git a/src/app/deals/components/shared/DealCard/DealCard.tsx b/src/app/deals/components/shared/DealCard/DealCard.tsx index c7fac01..382226e 100644 --- a/src/app/deals/components/shared/DealCard/DealCard.tsx +++ b/src/app/deals/components/shared/DealCard/DealCard.tsx @@ -1,4 +1,4 @@ -import { Card } from "@mantine/core"; +import { Card, Text } from "@mantine/core"; import { DealSchema } from "@/lib/client"; import styles from "./DealCard.module.css"; @@ -7,7 +7,11 @@ type Props = { }; const DealCard = ({ deal }: Props) => { - return {deal.name}; + return ( + + {deal.name} + + ); }; export default DealCard; diff --git a/src/components/dnd/SortableDnd/SortableDnd.tsx b/src/components/dnd/SortableDnd/SortableDnd.tsx index e0a28be..f859d58 100644 --- a/src/components/dnd/SortableDnd/SortableDnd.tsx +++ b/src/components/dnd/SortableDnd/SortableDnd.tsx @@ -109,13 +109,12 @@ const SortableDnd = ({ items={items} disabled={disabled}> + }}> {items.map((item, index) => ( - - - + + + + + + ); } diff --git a/src/theme.ts b/src/theme.ts index b97edea..e71932d 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -40,7 +40,12 @@ export const theme = createTheme({ Card: { defaultProps: { radius, - } - } + }, + }, + Text: { + defaultProps: { + size: "sm", + }, + }, }, });