Skip to content

Commit

Permalink
공통 테마 fixed 및 fab 클릭 액션 처리 수정, eslint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gongdongho12 committed Jul 19, 2020
1 parent 6922852 commit 09fb821
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"airbnb-base",
// "airbnb-base",
"plugin:react/recommended",
"plugin:jsx-a11y/recommended",
"plugin:import/errors",
Expand Down
5 changes: 2 additions & 3 deletions src/containers/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const size = 24
const MenuDom: FunctionComponent<any> = () => {
const history = useHistory()

return <Menu>
return <Menu style={{ border: '1px solid #eeeeee' }}>
<Menu.Item onClick={() => history.push('/add/1')}>
공동구매 상품등록
</Menu.Item>
Expand Down Expand Up @@ -181,15 +181,14 @@ const Home: FunctionComponent<ICardViewProps> = (props) => {
</InfiniteScroll>
</InfinityScrollWrapper>
{account?.id && <div style={{ position: "fixed", bottom: "20px", right: "20px" }}>
<Dropdown overlay={<MenuDom />} placement="topRight" arrow>
<Dropdown overlay={<MenuDom />} trigger={'click'} placement="topRight" arrow>
<Button
type="primary"
shape="circle"
size={"large"}
icon={<PlusOutlined />}
/>
</Dropdown>
{/* {onClick={() => history.push('/add/')}} */}
</div>}
</DefaultLayout>
);
Expand Down
5 changes: 4 additions & 1 deletion src/theme/customize.theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
@font-family: -apple-system, Noto Sans KR, sans-serif;
@font-size-base: 14px;
@border-radius-base: 2px;
@border-radius-sm: 2px
@border-radius-sm: 2px;
@border-color-base: #eeeeee; // major border color
@box-shadow-base: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),
0 9px 28px 8px rgba(0, 0, 0, 0.05);

0 comments on commit 09fb821

Please sign in to comment.