Yuki Takei 2 лет назад
Родитель
Сommit
e092cba56b

+ 0 - 2
apps/app/src/components/ItemsTree/ItemsTree.module.scss

@@ -17,8 +17,6 @@ $grw-pagetree-item-container-height: 40px;
   }
 
   :global {
-    min-height: calc(100vh - ($grw-sidebar-content-header-height + $grw-sidebar-content-footer-height));
-
     .btn-page-item-control {
       .icon-plus::before {
         font-size: 18px;

+ 3 - 1
apps/app/src/components/Sidebar/ResizableArea/ResizableArea.tsx

@@ -5,6 +5,7 @@ import styles from './ResizableArea.module.scss';
 
 
 type Props = {
+  className?: string,
   width?: number,
   minWidth?: number,
   disabled?: boolean,
@@ -16,6 +17,7 @@ type Props = {
 
 export const ResizableArea = memo((props: Props): JSX.Element => {
   const {
+    className,
     width, minWidth = 0,
     disabled, children,
     onResize, onResizeDone, onCollapsed,
@@ -76,7 +78,7 @@ export const ResizableArea = memo((props: Props): JSX.Element => {
     <>
       <div
         ref={resizableContainer}
-        className={`${styles['grw-resizable-area']} h-100`}
+        className={`${styles['grw-resizable-area']} ${className}`}
         style={{ width }}
       >
         {children}

+ 2 - 1
apps/app/src/components/Sidebar/Sidebar.tsx

@@ -91,6 +91,7 @@ export const SidebarSubstance = memo((): JSX.Element => {
 
   return (
     <ResizableArea
+      className="flex-expand-vert"
       width={resizableAreaWidth}
       minWidth={resizableAreaMinWidth}
       disabled={disableResizing}
@@ -99,7 +100,7 @@ export const SidebarSubstance = memo((): JSX.Element => {
       onCollapsed={collapsedByResizableAreaHandler}
     >
       <SidebarHead />
-      <div className="grw-sidebar-inner d-flex flex-row h-100">
+      <div className="grw-sidebar-inner flex-expand-horiz">
         <SidebarNav />
         <div className="sidebar-contents-container flex-grow-1 overflow-y-auto">
           <SidebarContents />

+ 0 - 1
apps/app/src/components/Sidebar/SidebarNav/SidebarNav.module.scss

@@ -8,7 +8,6 @@
   z-index: bs.$zindex-fixed;
 
   width: var.$grw-sidebar-nav-width;
-  height: 100vh;
 
   border-right : 1px solid var(--bs-border-color);