Merge branch 'master' into feat/bulk-export-pages-for-merge

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

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

src/client/styles/scss/theme/nature.scss

@@ -96,11 +96,6 @@ html[dark] {
   @import 'apply-colors';
   @import 'apply-colors-light';
 
-  // hljs
-  .hljs {
-    background-color: $bgcolor-inline-code;
-  }
-
   // Search Top
   .search-top {
     .btn-secondary.dropdown-toggle {