Merge pull request #145 from LikeLion-at-DGU/develop

🚀 Deploy
LikeLion-at-DGU · Oct 6, 2024 · c14b9df · c14b9df
2 parents e103804 + 89922b9
commit c14b9df
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/components/searchBar/SearchBarStyle.js b/src/components/searchBar/SearchBarStyle.js
@@ -5,8 +5,8 @@ export const SearchContainer = styled.div`
   justify-content: center;
   align-items: center;
   width: 90%;
-  margin: 10px auto;
-  padding: 3px 10px;
+  margin-bottom: 10px;
+  padding: 3px 5px;
   border: 1px solid #dddddd;
   border-radius: 10px;
   height: 35px;

diff --git a/src/components/topBar/styled.js b/src/components/topBar/styled.js
@@ -47,7 +47,7 @@ export const Background = styled.div`
   display: flex;
   flex-direction: column;
   width: 100%;
-  min-height: 120px;
+  min-height: 95px;
   gap: 10px;
   justify-content: center;
   align-items: center;

diff --git a/src/pages/booth/BoothPage.jsx b/src/pages/booth/BoothPage.jsx
@@ -486,7 +486,7 @@ export const BoothPage = () => {
                 {isDropdownOpen.time && (
                   <S.Dropdown>
                     <S.DropdownItem
-                      onClick={() => handleSelect("time", undefined)}
+                      onClick={() => handleSelect("time", "시간")}
                     >
                       전체
                     </S.DropdownItem>

diff --git a/src/pages/booth/Styled.js b/src/pages/booth/Styled.js
@@ -128,13 +128,20 @@ display: flex;
     height: 28px;
     font-size: 11px;
   }
+
+  /* 아이폰 12 Pro */
+  @media (max-width: 390px) {
+    width: 55px; /* 또는 필요한 스타일 */
+    height: 28px; /* 또는 필요한 스타일 */
+    font-size: 11px; /* 또는 필요한 스타일 */
+  }
 `;
 
 // 카카오맵이 들어갈 자리
 export const MapPlaceholder = styled.div`
   width: 100%;
   height: ${({ $isBoothListOpen }) =>
-    $isBoothListOpen ? "calc(100vh - 400px)" : "calc(100vh)"};
+    $isBoothListOpen ? "calc(100vh - 350px)" : "calc(100vh)"};
 
   background-color: #e0e0e0;
   display: flex;
@@ -158,7 +165,10 @@ export const BoothListWrapper = styled.div`
   z-index: 10;
 
   @media (max-width: 375px) {
-    height: ${({ $isOpen }) => ($isOpen ? "300px" : "0px")};
+    height: ${({ $isOpen }) => ($isOpen ? "250px" : "0px")};
+  }
+  @media (max-width: 390px) {
+    height: ${({ $isOpen }) => ($isOpen ? "350px" : "0px")};
   }
 `;