Merge branch 'feat/transplant-tabs-to-modal-for-master-merge' into imprv/gw3295-add-modal-new

src/client/js/app.jsx

@@ -27,7 +27,6 @@ import MyDraftList from './components/MyDraftList/MyDraftList';
 import SeenUserList from './components/User/SeenUserList';
 import LikerList from './components/User/LikerList';
 import TableOfContents from './components/TableOfContents';
-import TopOfTableContents from './components/TopOfTableContents';
 
 import PersonalSettings from './components/Me/PersonalSettings';
 import NavigationContainer from './services/NavigationContainer';
@@ -90,7 +89,6 @@ if (pageContainer.state.pageId != null) {
     'page-management': <PageManagement />,
 
     'revision-toc': <TableOfContents />,
-    'top-of-table-contents': <TopOfTableContents />,
     'seen-user-list': <SeenUserList />,
     'liker-list': <LikerList />,
 

src/client/js/components/Attachment.jsx

@@ -8,12 +8,7 @@ const Attachment = () => (
     width="20"
     height="20"
   >
-    <rect
-      className="cls-1"
-      width="14"
-      height="14"
-    />
-    <g className="cls-2">
+    <g className="cls-1">
       <path
         d="M2.9,13a2,2,0,0,1-1.44-.63,2.28,2.28,0,0,1,0-3.23l7-7.38a2.48,2.48,0,0,1,1.22-.7,2.61,
         2.61,0,0,1,1.41.09A3.46,3.46,0,0,1,12.37,2a3.94,3.94,0,0,1,.36.45A2.61,2.61,0,0,1,13,3a3.41,3.41,

src/client/js/components/PageList.jsx

@@ -8,11 +8,6 @@ const PageList = () => (
     width="20"
     height="20"
   >
-    <rect
-      className="cls-1"
-      width="14"
-      height="14"
-    />
     <path d="M12.63,2.72H1.37a.54.54,0,0,1,0-1.08H12.63a.54.54,0,0,1,0,1.08Z" />
     <path d="M11.82,5.94H1.37a.55.55,0,0,1,0-1.09H11.82a.55.55,0,1,1,0,1.09Z" />
     <path d="M9.41,9.15h-8a.54.54,0,0,1,0-1.08h8a.54.54,0,0,1,0,1.08Z" />

src/client/js/components/RecentChanges.jsx

@@ -8,11 +8,6 @@ const RecentChanges = () => (
     width="20"
     height="20"
   >
-    <rect
-      className="cls-1"
-      width="14"
-      height="14"
-    />
     <path
       d="M7.94.94A6.13,6.13,0,0,0,1.89,7v.1L.67,5.89a.38.38,0,0,0-.55,0,.39.39,0,0,0,0,.56L2.36,8.69,4.6,6.45a.4.4,0,0,0,0-.56.39.39,0,0,0-.56,
       0L2.68,7.25V7A5.33,5.33,0,0,1,7.94,1.73,5.33,5.33,0,0,1,13.21,7a5.34,5.34,0,0,1-5.27,5.27H7.86A5,5,0,0,1,4,10.38a.4.4,0,0,0-.55-.07.4.4,0,

src/client/js/components/TimeLine.jsx

@@ -8,11 +8,6 @@ const TimeLine = () => (
     width="20"
     height="20"
   >
-    <rect
-      className="cls-1"
-      width="14"
-      height="14"
-    />
     <path
       d="M13.6,4.6a1.2,1.2,0,0,1-1.2,1.2,1,1,0,0,1-.3,0L10,7.89a1.1,1.1,0,0,1,0,.31,1.2,1.2,0,1,1-2.4,0,1.1,1.1,0,0,1,
       0-.31L6.11,6.36a1.3,1.3,0,0,1-.62,0L2.75,9.1a1,1,0,0,1,0,.3A1.2,1.2,0,1,1,1.6,8.2a1,1,0,0,1,.3,0L4.64,

src/client/js/components/TopOfTableContents.jsx

@@ -3,13 +3,13 @@ import PropTypes from 'prop-types';
 
 import { withTranslation } from 'react-i18next';
 
+import PageContainer from '../services/PageContainer';
+
 import PageList from './PageList';
 import TimeLine from './TimeLine';
 import RecentChanges from './RecentChanges';
 import Attachment from './Attachment';
 
-import PageContainer from '../services/PageContainer';
-
 import { withUnstatedContainers } from './UnstatedUtils';
 
 const TopOfTableContents = (props) => {

src/client/styles/scss/_layout_growi.scss

@@ -18,9 +18,6 @@
       }
     }
     .cls-1 {
-      fill: none;
-    }
-    .cls-2 {
       isolation: isolate;
     }
   }

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

@@ -35,13 +35,6 @@
 
     {# relocate #revision-toc #}
     <div class="col-xl-2 col-lg-3 d-none d-lg-block revision-toc-container">
-      <div class="top-of-table-contents d-flex align-items-end justify-content-end">
-        <div
-          id="seen-user-list"
-          data-user-ids-str="{{ page.seenUsers|slice(-15)|default([])|reverse|join(',') }}"
-          data-sum-of-seen-users="{{ page.seenUsers.length|default(0) }}"
-        ></div>
-      </div>
       <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="116">
         <div id="revision-toc-content" class="revision-toc-content"></div>
       </div>