From 2f3895b866dc13fc1c27ce95ffaa63c4586d5a94 Mon Sep 17 00:00:00 2001 From: kangsuyeong Date: Sun, 11 Aug 2024 15:21:35 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[#34]=20=EC=B6=A9=EB=8F=8C=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Navbar/Navbar.style.js | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/FITple-Frontend/src/components/Navbar/Navbar.style.js b/FITple-Frontend/src/components/Navbar/Navbar.style.js index c473e75..9ed80f4 100644 --- a/FITple-Frontend/src/components/Navbar/Navbar.style.js +++ b/FITple-Frontend/src/components/Navbar/Navbar.style.js @@ -59,29 +59,3 @@ export const SearchContainer = styled.div` display: ${(props) => (props.$blue ? "none" : "flex")}; align-items: center; `; -<<<<<<< HEAD -======= -export const SearchInputBox = styled.input` - width: 100%; - height: 100%; - font-size: 16px; - font-weight: 500; - box-sizing: border-box; - border: 2px solid #0276fe; - border-radius: 30px; - padding-left: 55px; - color: #838383; - outline: none; - box-shadow: 0px 1px 3px #0000001a, 0px 5px 5px #00000017, - 0px 11px 6px #0000000d, 0px 19px 8px #00000003, 0px 29px 8px #00000000; -`; - -export const SearchIconBox = styled.button` - background: none; - border: none; - cursor: pointer; - position: absolute; - padding: 0px; - left: 28px; -`; ->>>>>>> 2fbb6971e30b4c2563001379be534ac061abc66f