Explorar o código

Merge branch 'dev/5.0.x' into imprv/show-not-impelemted-features-with-mock-data

Taichi Masuyama %!s(int64=4) %!d(string=hai) anos
pai
achega
8fe7580c1d

+ 1 - 1
packages/app/src/components/SearchPage/SearchResultContentSubNavigation.tsx

@@ -32,7 +32,7 @@ const SearchResultContentSubNavigation: FC<Props> = (props : Props) => {
   const { isSharedUser } = appContainer;
   const { isSharedUser } = appContainer;
   const isAbleToShowPageManagement = !(isTrashPage(path)) && !isSharedUser;
   const isAbleToShowPageManagement = !(isTrashPage(path)) && !isSharedUser;
   return (
   return (
-    <div className="position-sticky fixed-top shadow-sm search-result-content-nav">
+    <div className="shadow-sm search-result-content-nav">
       <div className={`grw-subnav container-fluid d-flex align-items-start justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
       <div className={`grw-subnav container-fluid d-flex align-items-start justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
         {/* Left side */}
         {/* Left side */}
         <div className="grw-path-nav-container">
         <div className="grw-path-nav-container">

+ 1 - 1
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -191,7 +191,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
           </div>
           </div>
         </button>
         </button>
         <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
         <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
-          <p className={`grw-pagetree-title m-auto ${page.isEmpty && 'text-muted'}`}>{nodePath.basename(page.path as string) || '/'}</p>
+          <p className={`text-truncate m-auto ${page.isEmpty && 'text-muted'}`}>{nodePath.basename(page.path as string) || '/'}</p>
         </a>
         </a>
         <div className="grw-pagetree-count-wrapper">
         <div className="grw-pagetree-count-wrapper">
           <ItemCount />
           <ItemCount />

+ 0 - 5
packages/app/src/styles/_page-tree.scss

@@ -34,11 +34,6 @@ $grw-pagetree-item-padding-left: 10px;
       width: 100%;
       width: 100%;
       overflow: hidden;
       overflow: hidden;
       text-decoration: none;
       text-decoration: none;
-
-      .grw-pagetree-title {
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
     }
     }
 
 
     .grw-pagetree-count-wrapper {
     .grw-pagetree-count-wrapper {