Merge branch 'dev' of https://github.com/Strong-Potato/TripVote-FE in…

…to 184-refactor-home-page-detail
Strong-Potato · Jan 26, 2024 · 771c30a · 771c30a
2 parents 1650f24 + a3b1d60
commit 771c30a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/components/Route/DayNavigationBar/DayNavigationBar.module.scss b/src/components/Route/DayNavigationBar/DayNavigationBar.module.scss
@@ -2,7 +2,7 @@
 
 .container {
   position: sticky;
-  top: 25.5rem;
+  top: 20.5rem;
 
   nav {
     height: 7rem;

diff --git a/src/components/Route/RouteTabPanel/RouteTabPanel.module.scss b/src/components/Route/RouteTabPanel/RouteTabPanel.module.scss
@@ -9,7 +9,7 @@
 
   .mapContainer {
     position: sticky;
-    top: 9.6rem;
+    top: 4.5rem;
     width: 100%;
     min-width: 36rem;
     max-width: 45rem;

diff --git a/src/components/VoteTabPanel/VoteTabPanel.module.scss b/src/components/VoteTabPanel/VoteTabPanel.module.scss
@@ -1,4 +1,4 @@
-@use "@/sass" as *;
+@use '@/sass' as *;
 
 .cotainer {
   width: 100%;
@@ -14,7 +14,7 @@
   background-color: $neutral0;
 
   position: sticky;
-  top: 97px;
+  top: 46px;
   z-index: 3;
 
   &__counts {

diff --git a/src/pages/Trip/Trip.module.scss b/src/pages/Trip/Trip.module.scss
@@ -1,7 +1,7 @@
 @use '@/sass' as *;
 
 .container {
-  margin-top: 56px;
+  padding-top: 56px;
   width: 100%;
   min-width: 36rem;
   max-width: 45rem;
@@ -137,7 +137,7 @@
 
   .contents {
     width: 100%;
-    height: calc(100vh - 50px);
+    height: calc(100vh - 112px);
 
     background-color: $neutral0;
     border-radius: 16px 16px 0px 0px;
@@ -148,7 +148,7 @@
     //indicator와 tabList를 하나로 묶은 div입니다
     &__stickyTabList {
       position: sticky;
-      top: 50px;
+      top: 0px;
       z-index: 5;
       border-radius: 16px 16px 0px 0px;
       background-color: $neutral0;
@@ -167,8 +167,9 @@
     }
 
     &__tabContent {
-      height: 100%;
-      min-height: calc(100vh - 5rem);
+      height: calc(100% - 56px);
+      min-height: calc(100vh - 10rem);
+      margin-top: 0;
       // overflow-y: auto;
       // max-height: calc(100vh - 34rem);
     }