diff --git a/src/components/Comment/DisqusComments.tsx b/src/components/Comment/DisqusComments.tsx index aea1a38..dc437ee 100644 --- a/src/components/Comment/DisqusComments.tsx +++ b/src/components/Comment/DisqusComments.tsx @@ -1,5 +1,5 @@ -import { DiscussionEmbed } from "disqus-react"; import { css } from "@emotion/react"; +import { DiscussionEmbed } from "disqus-react"; import { useRouter } from "next/router"; const DisqusComments = (post) => { @@ -26,7 +26,4 @@ export default DisqusComments; const footer = css` overflow: hidden; - /* iframe { - margin-bottom: 0rem; - } */ `; diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index a1d6a66..df73603 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -1,6 +1,6 @@ import { css, Theme } from "@emotion/react"; -import Inform from "components/Footer/Inform"; import GoLink from "components/Footer/GoLink"; +import Inform from "components/Footer/Inform"; function Footer() { return ( @@ -34,7 +34,7 @@ const wrapper = (theme: Theme) => css` width: 100%; height: 12rem; - color: #d5d8dd; + color: ${theme.color.grey500}; background-color: ${theme.color.grey100}; font-size: 13px; font-weight: ${theme.fontWeight.light}; diff --git a/src/components/Nav/BottomCategory.tsx b/src/components/Nav/BottomCategory.tsx index 0e20329..9092c9d 100644 --- a/src/components/Nav/BottomCategory.tsx +++ b/src/components/Nav/BottomCategory.tsx @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; -import { useRouter } from "next/router"; import Link from "next/link"; +import { useRouter } from "next/router"; import { ReactNode } from "react"; interface Props { @@ -12,7 +12,7 @@ interface Props { function BottomCategory({ path, category, icon }: Props) { const router = useRouter(); const click = { - color: router.asPath === path ? "#000000" : "#888888", + color: router.asPath === path ? "#000000" : "#757575", fontWeight: router.asPath === path ? "700" : "500", }; return ( diff --git a/src/components/Nav/SearchBar.tsx b/src/components/Nav/SearchBar.tsx index 0e326fc..1c2ff3f 100644 --- a/src/components/Nav/SearchBar.tsx +++ b/src/components/Nav/SearchBar.tsx @@ -10,9 +10,14 @@ function SearchBar({ search, onChange }: Props) { return (
+ @@ -39,6 +44,11 @@ const inputWrapper = css` align-items: center; `; +const labelCss = css` + position: absolute; + left: -10px; +`; + const inputCss = (theme: Theme) => css` outline: none; border: none; @@ -46,8 +56,7 @@ const inputCss = (theme: Theme) => css` border-radius: 12px; width: 100%; height: 100%; - padding: 0.77rem 0.815rem; - - font-weight: ${theme.fontWeight.normal}; + padding: 0.7rem 0.815rem; font-size: 0.87rem; + font-weight: ${theme.fontWeight.normal}; `; diff --git a/src/components/Nav/TopCategory.tsx b/src/components/Nav/TopCategory.tsx index c4a8441..90f3198 100644 --- a/src/components/Nav/TopCategory.tsx +++ b/src/components/Nav/TopCategory.tsx @@ -11,7 +11,7 @@ function TopCategory({ path, category }: Props) { const router = useRouter(); const click = { - color: router.asPath === path ? "#000000" : "#888888", + color: router.asPath === path ? "#000000" : "#757575", fontSize: "0.94rem", fontWeight: router.asPath === path ? "700" : "500", }; @@ -19,7 +19,7 @@ function TopCategory({ path, category }: Props) { return ( -
{category}
+
{category}
); diff --git a/src/components/Nav/index.tsx b/src/components/Nav/index.tsx index 5e0e606..0c8f111 100644 --- a/src/components/Nav/index.tsx +++ b/src/components/Nav/index.tsx @@ -1,6 +1,6 @@ import { css, Theme } from "@emotion/react"; -import Category from "components/Nav/TopLink"; import SearchBar from "components/Nav/SearchBar"; +import Category from "components/Nav/TopLink"; import Link from "next/link"; import { ChangeEvent } from "react"; @@ -13,19 +13,15 @@ function Nav({ search, onChange }: Props) { return (
- - -

์˜จ์ˆ˜๋ƒ ๋ƒ ๋ƒ 

-
+ +

์˜จ์ˆ˜๋ƒ ๋ƒ ๋ƒ 

-
- - - - - -
+ +
+ +
+
diff --git a/src/components/Review/Introduce.tsx b/src/components/Review/Introduce.tsx index cda6575..31f09af 100644 --- a/src/components/Review/Introduce.tsx +++ b/src/components/Review/Introduce.tsx @@ -1,6 +1,6 @@ import { css, Theme } from "@emotion/react"; -import Link from "next/link"; import HelpIcon from "@mui/icons-material/Help"; +import Link from "next/link"; function Introduce() { return ( @@ -8,10 +8,8 @@ function Introduce() {

ํ›„๊ธฐํŽ˜์ด์ง€

- - - - + +
diff --git a/src/pages/Notice/Report.tsx b/src/pages/Notice/Report.tsx index c2e9afe..3b74d92 100644 --- a/src/pages/Notice/Report.tsx +++ b/src/pages/Notice/Report.tsx @@ -1,11 +1,11 @@ import { css, Theme } from "@emotion/react"; import IntroText from "components/Text/IntroText"; -import { motion } from "framer-motion"; import { + defaultFadeInLeftVariants, defaultFadeInUpVariants, staggerOne, - defaultFadeInLeftVariants, } from "constants/motion"; +import { motion } from "framer-motion"; function Report() { return ( diff --git a/src/pages/Notice/index.tsx b/src/pages/Notice/index.tsx index fb66a11..7061c3d 100644 --- a/src/pages/Notice/index.tsx +++ b/src/pages/Notice/index.tsx @@ -1,10 +1,10 @@ import { css } from "@emotion/react"; -import InformCard from "components/Card/InformCard"; -import bgLottieRandom from "assets/lottieJSON/random.json"; -import bgLottieHi from "assets/lottieJSON/cardHi.json"; import bgLottieComm from "assets/lottieJSON/cardComm.json"; +import bgLottieHi from "assets/lottieJSON/cardHi.json"; import bgLottieInquiry from "assets/lottieJSON/cardInquiry.json"; import bgLottieReview from "assets/lottieJSON/cardReview.json"; +import bgLottieRandom from "assets/lottieJSON/random.json"; +import InformCard from "components/Card/InformCard"; import Intro from "components/Notice/Intro"; function Notice() { diff --git a/src/styles/Theme/theme.ts b/src/styles/Theme/theme.ts index b59eb6d..4adf99d 100644 --- a/src/styles/Theme/theme.ts +++ b/src/styles/Theme/theme.ts @@ -4,10 +4,10 @@ const theme = { white: "#fafafa", border: "#f2f2f2", black: "#000000", - yellow: "#fbc531", + yellow: "#edb900", grey100: "#f9f9f9", - grey500: "#888888", - grey900: "#5d5d5d", + grey500: "#757575", + grey900: "#444444", }, fontWeight: { light: 300,