Merge branch 'master' into imprv/link-bookmark-and-recently-created-with-anchor-tag

src/client/js/components/PageList/BookmarkList.jsx

@@ -55,13 +55,13 @@ const BookmarkList = (props) => {
    *
    */
   const generatePageList = pages.map(page => (
-    <li key={`my-bookmarks:${page._id}`}>
+    <li key={`my-bookmarks:${page._id}`} className="mt-4">
       <Page page={page.page} />
     </li>
   ));
 
   return (
-    <div className="page-list-container-create">
+    <div className="bookmarks-list-container">
       {pages.length === 0 ? t('No bookmarks yet') : (
         <>
           <ul className="page-list-ul page-list-ul-flat mb-3">

src/client/js/components/RecentCreated/RecentCreated.jsx

@@ -56,7 +56,7 @@ class RecentCreated extends React.Component {
    */
   generatePageList(pages) {
     return pages.map(page => (
-      <li key={`recent-created:list-view:${page._id}`}>
+      <li key={`recent-created:list-view:${page._id}`} className="mt-4">
         <Page page={page} />
       </li>
     ));

src/client/styles/scss/_comment_growi.scss

@@ -34,7 +34,7 @@
 
   .page-comments-row {
     // offset margin left to apply bg-color
-    margin: 30px 0px 30px -15px;
+    margin: 30px -15px 30px -15px;
   }
 
   .page-comments {

src/server/views/layout-growi/user_page.html

@@ -51,19 +51,19 @@
   {% include 'widget/comments.html' %}
 
   {% if page %}
-    <div class="grw-page-list-m my-5 d-edit-none">
-      <h1 class="grw-page-list-title-m border-bottom pb-2 mb-3" id="bookmarks-list">
+    <div class="grw-page-list-m mt-5 pb-5 d-edit-none">
+      <h2 class="grw-page-list-title-m border-bottom pb-2 mb-3" id="bookmarks-list">
         <i id="user-bookmark-icon"></i>
         Bookmarks
-      </h1>
+      </h2>
       <div class="page-list" id="user-bookmark-list">
         <div class="page-list-container">
         </div>
       </div>
     </div>
 
-    <div class="grw-page-list-m my-5 d-edit-none">
-      <h1 class="grw-page-list-title-m border-bottom pb-2 mb-3" id="recently-created-list">
+    <div class="grw-page-list-m mt-5 pb-5 d-edit-none">
+      <h2 class="grw-page-list-title-m border-bottom pb-2 mb-3" id="recently-created-list">
         <i id="recent-created-icon"></i>
         Recently Created
       </h2>

src/server/views/layout-growi/widget/comments.html

@@ -2,7 +2,7 @@
 
   <div class="page-comments col-lg-10 my-5">
 
-    <h1 class="border-bottom pb-2 mb-3"><i class="icon-fw icon-bubbles"></i> Comments</h1>
+    <h2 class="border-bottom pb-2 mb-3"><i class="icon-fw icon-bubbles"></i> Comments</h2>
 
     <div class="page-comments-list" id="page-comments-list"></div>
 

src/server/views/widget/alert_siteurl_undefined.html

@@ -1,5 +1,5 @@
 {% if !getConfig('crowi', 'app:siteUrl') %}
-<div class="alert alert-danger mb-0 px-4 py-2">
+<div class="alert alert-danger d-edit-none mb-0 px-4 py-2">
   <i class="icon-exclamation"></i>
   {{ t("security_setting.alert_siteUrl_is_not_set", { link:t('App Settings')}) }}
 </div>