Skip to content

Commit 8999ed0

Browse files
authored
Merge pull request #111 from boostcamp-2020/feat/110
Listํƒ€์ž… ์Šคํƒ€์ผ ์ˆ˜์ •
2 parents e29c1ba + 54f0b54 commit 8999ed0

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

โ€Žfrontend/src/components/atoms/BlockContent/BlockContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const isGridOrColumn = (block: Block): boolean =>
2020

2121
const blockContentCSS = css`
2222
display: flex;
23-
align-items: center;
23+
align-items: stretch;
2424
`;
2525
const editableDivCSS = (block: Block): SerializedStyles => css`
2626
margin: 5;

โ€Žfrontend/src/components/molecules/BlockComponent/BlockComponent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
1616
const isGridOrColumn = (block: Block): boolean =>
1717
block.type === BlockType.GRID || block.type === BlockType.COLUMN;
1818

19-
const blockCss = (): SerializedStyles => css`
19+
const blockCss = css`
2020
width: 100%;
2121
max-width: 1000px;
2222
margin-top: 3px;
@@ -41,7 +41,7 @@ function BlockComponent({ blockDTO }: { blockDTO: Block }): JSX.Element {
4141
const blockRef: any = blockRefState[blockDTO.id];
4242

4343
return (
44-
<div css={blockCss()}>
44+
<div css={blockCss}>
4545
<div
4646
css={{ position: 'relative' }}
4747
onMouseEnter={() => setHoverId(blockDTO.id)}

โ€Žfrontend/src/utils/blockContent.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,22 @@ export const regex: { [key: string]: RegExp } = {
1313
quote: /^\|\s[^\s.]*/gm,
1414
};
1515

16+
const divCSS = css`
17+
margin: 0px 4px;
18+
font-size: 18px;
19+
color: inherit;
20+
height: 100%;
21+
`;
22+
1623
export const listComponent: { [key: string]: any } = {
17-
bulletedlist: <span>โ€ข</span>,
18-
numberedlist: <span> 1. </span>,
24+
bulletedlist: <div css={divCSS}>โ€ข</div>,
25+
numberedlist: <div css={divCSS}> 1. </div>,
1926
togglelist: (
20-
<span>
27+
<div css={divCSS}>
2128
<Toggle />
22-
</span>
29+
</div>
2330
),
24-
quote: <span>โ–•</span>,
31+
quote: <div css={divCSS}>โ–•</div>,
2532
};
2633

2734
export const fontSize: { [key: string]: string } = {
@@ -35,4 +42,5 @@ export const placeHolder: { [key: string]: string } = {
3542
heading1: 'Heading 1',
3643
heading2: 'Heading 2',
3744
heading3: 'Heading 3',
45+
quote: 'Empty quote',
3846
};

0 commit comments

Comments
ย (0)