Просмотр исходного кода

Merge remote-tracking branch 'origin/dev/5.0.x' into rc/5.0.x

Yuki Takei 4 лет назад
Родитель
Сommit
f5d784512c
2 измененных файлов с 13 добавлено и 8 удалено
  1. 12 4
      packages/app/src/styles/_search.scss
  2. 1 4
      packages/app/src/styles/_sidebar.scss

+ 12 - 4
packages/app/src/styles/_search.scss

@@ -85,7 +85,7 @@
   }
 }
 
-// layout
+// layout for GlobalSearch
 .grw-global-search-top {
   // centering on navbar
   top: $grw-navbar-height / 2;
@@ -121,9 +121,12 @@
   }
 }
 
-// TODO : keep the selected list in the same positino as other lists
-// TASK : https://redmine.weseek.co.jp/issues/82470
-.search-result {
+// layout
+.on-search {
+  .page-wrapper {
+    padding-bottom: unset;
+  }
+
   .search-control {
     padding: 5px 0;
   }
@@ -145,7 +148,12 @@
       // subtract the height of GrowiNavbar + (SearchControl component + other factors)
       height: calc(100vh - (($grw-navbar-height + $grw-navbar-border-width) + 110px));
       overflow-y: scroll;
+
+      @include media-breakpoint-down(sm) {
+        height: calc(100vh - (($grw-navbar-height + $grw-navbar-border-width + $grw-navbar-bottom-height) + 123px));
+      }
     }
+
     .nav.nav-pills {
       > .grw-search-result-item {
         min-height: 136px;

+ 1 - 4
packages/app/src/styles/_sidebar.scss

@@ -343,10 +343,7 @@
   .grw-sidebar {
     height: $search-page-sidebar-height;
     .data-layout-container {
-      height: $search-page-sidebar-height;
-    }
-    .grw-sidebar-nav {
-      height: $search-page-sidebar-height;
+      height: 100%;
     }
   }
 }