fix: solve conflict after merging with main

sparcs-kaist · Nov 22, 2023 · ddacbbd · ddacbbd
1 parent 8a15778
commit ddacbbd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/web/src/components/atoms/Button.tsx b/packages/web/src/components/atoms/Button.tsx
@@ -33,7 +33,7 @@ export const Button = styled.button<{
 
     &:disabled {
       cursor: none;
-      background-color: ${theme.colors.white};
+      background-color: ${colors.white};
     }
   `,
 );

diff --git a/packages/web/src/components/organisms/CreateAgendaModal.tsx b/packages/web/src/components/organisms/CreateAgendaModal.tsx
@@ -199,7 +199,14 @@ export const CreateAgendaModal: React.FC = () => {
               style={{ textDecoration: "none" }}
             >
               <Button w={270} h={38} onClick={onSubmit} disabled={!validated}>
-                <p css={[text.boldtitle3, validated ? text.blue600 : text.gray300]}>투표 생성하기</p>
+                <p
+                  css={[
+                    text.boldtitle3,
+                    validated ? text.blue600 : text.gray300,
+                  ]}
+                >
+                  투표 생성하기
+                </p>
               </Button>
             </Link>
           </Box>

diff --git a/packages/web/src/components/organisms/Header.tsx b/packages/web/src/components/organisms/Header.tsx
@@ -2,18 +2,7 @@ import { LogoIcon } from "@biseo/web/assets";
 import { Box } from "@biseo/web/components/atoms";
 import { HeaderItem, Profile } from "@biseo/web/components/molecules";
 import { useAuth } from "@biseo/web/services/auth";
-import {
-  align,
-  bg,
-  center,
-  colors,
-  column,
-  h,
-  justify,
-  round,
-  text,
-  w,
-} from "@biseo/web/styles";
+import { bg, center, colors, h, round, text, w } from "@biseo/web/styles";
 import styled from "@emotion/styled";
 import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";