fix: [#34] 충돌해결

UMC-FITple · Aug 11, 2024 · 2f3895b · 2f3895b
1 parent 1e7a302
commit 2f3895b
Showing 1 changed file with 0 additions and 26 deletions.
diff --git 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