💄 [Client] Nav.js : 충돌 전체 수정

codestates · Aug 28, 2021 · 51f5c0f · 51f5c0f
2 parents ce826a9 + 72bef4e
commit 51f5c0f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/client/src/app.css b/client/src/app.css
@@ -109,14 +109,17 @@ nav {
 }
 
 section {
-  height: 55vh;
+  height: 60vh;
   background-color: #ffe65b;
 }
 
 footer {
-  height: 10vh;
-  min-height: 67px;
-  line-height: 10vh;
+  height: 4.5vh;
+  line-height: 4.5vh;
   text-align: center;
+<<<<<<< HEAD
   font-size: max(0.85vw, 11px);
+=======
+  font-size: max(0.9vw, 10px);
+>>>>>>> 72bef4e71c5f8079159c860dec0c8ffddb357c70
 }
diff --git a/client/src/comp/Nav.js b/client/src/comp/Nav.js
@@ -20,7 +20,7 @@ function Nav({ isLogin }) {
     height: 7vh;
     border: none;
     border-radius: 40px;
-    font-size: 0.98rem;
+    font-size: max(0.85vw, 12px);
     font-weight: 700;
     display: block;
     margin-top: 5vh;
@@ -33,14 +33,18 @@ function Nav({ isLogin }) {
     &:nth-child(1) {
       margin-top: 0;
     }
+    :hover {
+      background-color: black;
+      color: white;
+    }
   `;
 
   const Button2 = styled.button`
     width: 20vh;
     height: 7vh;
     border: none;
     border-radius: 40px;
-    font-size: 0.98rem;
+    font-size: max(0.85vw, 12px);
     font-weight: 700;
     display: block;
     margin: 5vh auto 0;
@@ -53,6 +57,10 @@ function Nav({ isLogin }) {
     &:nth-child(1) {
       margin-top: 0;
     }
+    :hover {
+      background-color: black;
+      color: white;
+    }
   `;
 
   const ProfileWrap = styled.div`
@@ -71,7 +79,7 @@ function Nav({ isLogin }) {
       height: 7vh;
       border: none;
       border-radius: 40px;
-      font-size: 0.98rem;
+      font-size: max(0.85vw, 12px);
       font-weight: 700;
       display: block;
       margin: 0 auto;

diff --git a/client/src/comp/SearchInput.js b/client/src/comp/SearchInput.js
@@ -15,7 +15,7 @@ const SearchWrap = styled.div`
     border-radius: 30px;
     margin-right: 10px;
     outline: none;
-    padding-left: 20px;
+    padding-left: max;
   }
   > .searchBtn {
     width: 6vw;