Merge pull request #231 from sopt-makers/feat/#230-makers-frontend-li…

…brary [SP2] @sopt-makers/colors 적용
sopt-makers · Oct 22, 2023 · ef8bb91 · ef8bb91
2 parents 480f73f + dc197fc
commit ef8bb91
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 87 deletions.
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "@amplitude/analytics-browser": "^2.3.0",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
+    "@sopt-makers/colors": "^2.2.0",
     "@types/qs": "6.9.7",
     "axios": "^0.27.2",
     "classcat": "^5.0.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/Footer/OriginFooter/style.ts b/src/components/Footer/OriginFooter/style.ts
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { colors } from '@src/lib/styles/colors';
+import { colors } from '@sopt-makers/colors';
 
 export const Root = styled.footer`
   width: 100%;

diff --git a/src/components/Header/Mobile/HeaderMenu.style.ts b/src/components/Header/Mobile/HeaderMenu.style.ts
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
 import Link from 'next/link';
 import { css } from '@emotion/react';
 import { FadeIn, FadeInDown, FadeOut, FadeOutUp } from '@src/lib/styles/animation';
-import { colors } from '@src/lib/styles/colors';
 
 type MenuType = 'idle' | 'open' | 'close';
 

diff --git a/src/components/common/RoundButton/RoundButton.style.tsx b/src/components/common/RoundButton/RoundButton.style.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { colors } from '@src/lib/styles/colors';
+import { colors } from '@sopt-makers/colors';
 
 interface StyleProps {
   isReverse?: boolean;
@@ -14,7 +14,7 @@ export const Root = styled.button<StyleProps>`
   border-radius: 99px;
   background: ${colors.gray10};
 
-  color: ${colors.gray900};
+  color: ${colors.gray950};
   font-size: 24px;
   font-weight: 600;
   line-height: 150%; /* 36px */

diff --git a/src/lib/styles/colors.ts b/src/lib/styles/colors.ts
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
 import { useRouter } from 'next/router';
 import { Header } from '@src/components';
 import RoundButton from '@src/components/common/RoundButton';
-import { colors } from '@src/lib/styles/colors';
 
 function Wrong() {
   const router = useRouter();

diff --git a/src/views/ReviewPage/components/Description/index.tsx b/src/views/ReviewPage/components/Description/index.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { colors } from '@src/lib/styles/colors';
+import { colors } from '@sopt-makers/colors';
 
 const Description = () => {
   return <Title>SOPT 회원들의 활동 후기</Title>;

diff --git a/src/views/RulesPage/components/CollapseLi/CollapseLi.style.tsx b/src/views/RulesPage/components/CollapseLi/CollapseLi.style.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
 import { css } from '@emotion/react';
 import { ArrowDownAnimation, ArrowUpAnimation } from '@src/lib/styles/animation';
-import { colors } from '@src/lib/styles/colors';
 
 interface ButtonStyleProps {
   isOpened: boolean;

diff --git a/src/views/SopticlePage/components/Description/index.tsx b/src/views/SopticlePage/components/Description/index.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { colors } from '@src/lib/styles/colors';
+import { colors } from '@sopt-makers/colors';
 
 const Description = () => {
   return <Title>솝티클</Title>;