Merge branch 'master' of https://github.com/weseek/growi into imprv/nav-2nd-ed

src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -69,9 +69,9 @@ const AdminNavigation = (props) => {
   };
 
   return (
-    <div>
+    <React.Fragment>
       {/* List group */}
-      <div className="list-group admin-navigation d-none d-lg-block">
+      <div className="list-group admin-navigation sticky-top d-none d-lg-block">
         {getListGroupItemOrDropdownItemList(true)}
       </div>
 
@@ -104,7 +104,7 @@ const AdminNavigation = (props) => {
         </div>
       </div>
 
-    </div>
+    </React.Fragment>
   );
 };
 

src/client/styles/scss/_admin.scss

@@ -171,6 +171,11 @@
   }
 }
 
-.admin-navigation > a + a {
-  margin-top: 2px;
+.admin-navigation {
+  & > a + a {
+    margin-top: 2px;
+  }
+  &.sticky-top {
+    top: 30px;
+  }
 }