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

I corrected the parts pointed out.

Shu Katabe 5 лет назад
Родитель
Сommit
b96816e58f

+ 15 - 11
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -53,11 +53,13 @@ const PagePathNav = ({ pageId, pagePath, isPageForbidden }) => {
       {formerLink}
       <span className="d-flex align-items-center">
         <h1 className="m-0">{latterLink}</h1>
-        <RevisionPathControls
-          pageId={pageId}
-          pagePath={pagePath}
-          isPageForbidden={isPageForbidden}
-        />
+        <div className="mx-2">
+          <RevisionPathControls
+            pageId={pageId}
+            pagePath={pagePath}
+            isPageForbidden={isPageForbidden}
+          />
+        </div>
       </span>
     </div>
   );
@@ -72,10 +74,12 @@ const UserPagePathNav = ({ pageId, pagePath }) => {
     <div className="grw-page-path-nav">
       <span className="d-flex align-items-center flex-wrap">
         <h4 className="grw-user-page-path">{latterLink}</h4>
-        <RevisionPathControls
-          pageId={pageId}
-          pagePath={pagePath}
-        />
+        <div className="mx-2">
+          <RevisionPathControls
+            pageId={pageId}
+            pagePath={pagePath}
+          />
+        </div>
       </span>
     </div>
   );
@@ -162,14 +166,14 @@ const GrowiSubNavigation = (props) => {
     <div className={`grw-subnav d-flex align-items-center justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
 
       {/* Left side */}
-      <div className="d-flex overflow-hidden">
+      <div className="d-flex grw-subnav-left-side">
         { isDrawerMode && (
           <div className="d-none d-md-flex align-items-center border-right mr-3 pr-3">
             <DrawerToggler />
           </div>
         ) }
 
-        <div className="overflow-hidden">
+        <div className="grw-path-nav-container">
           { !isCompactMode && !isPageNotFound && !isPageForbidden && !isUserPage && (
             <div className="mb-2">
               <TagLabels />

+ 2 - 2
src/client/js/components/Page/RevisionPathControls.jsx

@@ -21,14 +21,14 @@ const RevisionPathControls = (props) => {
   const isPageInTrash = isTrashPage(pagePath);
 
   return (
-    <div className="mx-2">
+    <>
       <CopyDropdown pagePath={pagePath} pageId={pageId} buttonStyle={buttonStyle} />
       { !isPageInTrash && !isPageForbidden && (
         <a href="#edit" className="d-edit-none text-muted btn btn-secondary bg-transparent btn-edit border-0" style={buttonStyle}>
           <i className="icon-note" />
         </a>
       ) }
-    </div>
+    </>
   );
 };
 

+ 16 - 10
src/client/styles/scss/_on-edit.scss

@@ -29,18 +29,24 @@ body.on-edit {
     }
   }
 
-  .grw-page-path-nav {
-    white-space: nowrap;
-
-    .grw-page-path-hierarchical-link {
-      display: inline-block;
-      width: 100%;
+  .grw-subnav-left-side {
+    overflow: hidden;
+    .grw-path-nav-container {
       overflow: hidden;
-      text-overflow: ellipsis;
-    }
+      .grw-page-path-nav {
+        white-space: nowrap;
+
+        .grw-page-path-hierarchical-link {
+          display: inline-block;
+          width: 100%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
 
-    h1 {
-      overflow: hidden;
+        h1 {
+          overflow: hidden;
+        }
+      }
     }
   }