Yuki Takei 5 лет назад
Родитель
Сommit
c7eb973786

+ 4 - 4
src/client/js/components/PageAccessoriesModal.jsx

@@ -35,7 +35,7 @@ const PageAccessoriesModal = (props) => {
       <Modal size="lg" isOpen={props.isOpen} toggle={closeModalHandler} className="grw-page-accessories-modal">
         <ModalBody>
           <Nav className="nav-title border-bottom">
-            <NavItem type="button" className={`nav-link grw-page-list-icon ${activeTab === 'pagelist' && 'active active-border'}`}>
+            <NavItem type="button" className={`nav-link ${activeTab === 'pagelist' && 'active active-border'}`}>
               <NavLink
                 onClick={() => {
                   switchActiveTab('pagelist');
@@ -45,7 +45,7 @@ const PageAccessoriesModal = (props) => {
                 {t('page_list')}
               </NavLink>
             </NavItem>
-            <NavItem type="button" className={`nav-link grw-time-line-icon ${activeTab === 'timeline' && 'active active-border'}`}>
+            <NavItem type="button" className={`nav-link ${activeTab === 'timeline' && 'active active-border'}`}>
               <NavLink
                 onClick={() => {
                   switchActiveTab('timeline');
@@ -55,7 +55,7 @@ const PageAccessoriesModal = (props) => {
                 {t('Timeline View')}
               </NavLink>
             </NavItem>
-            <NavItem type="button" className={`nav-link grw-recent-changes-icon ${activeTab === 'page-history' && 'active active-border'}`}>
+            <NavItem type="button" className={`nav-link ${activeTab === 'page-history' && 'active active-border'}`}>
               <NavLink
                 onClick={() => {
                   switchActiveTab('page-history');
@@ -65,7 +65,7 @@ const PageAccessoriesModal = (props) => {
                 {t('History')}
               </NavLink>
             </NavItem>
-            <NavItem type="button" className={`nav-link grw-attachment-icon ${activeTab === 'attachment' && 'active active-border'}`}>
+            <NavItem type="button" className={`nav-link ${activeTab === 'attachment' && 'active active-border'}`}>
               <NavLink
                 onClick={() => {
                   switchActiveTab('attachment');

+ 3 - 3
src/client/js/components/User/SeenUserList.jsx

@@ -20,12 +20,12 @@ const SeenUserList = (props) => {
   const toggle = () => setPopoverOpen(!popoverOpen);
   const { pageContainer } = props;
   return (
-    <div className="btn-seen-user-list pl-2 ml-2">
-      <Button id="SeenUserPopover" type="button" className="btn border-0 px-2 py-0 bg-transparent">
+    <div className="grw-seen-user-list pl-2 ml-2">
+      <Button id="po-seen-user" color="link" className="px-2 py-0">
         <span className="mr-1 footstamp-icon"><FootstampIcon /></span>
         <span className="seen-user-count">{pageContainer.state.countOfSeenUsers}</span>
       </Button>
-      <Popover placement="bottom" isOpen={popoverOpen} target="SeenUserPopover" toggle={toggle} trigger="legacy">
+      <Popover placement="bottom" isOpen={popoverOpen} target="po-seen-user" toggle={toggle} trigger="legacy">
         <PopoverBody className="seen-user-popover">
           <div className="px-2 text-right user-list-content text-truncate text-muted">
             <UserPictureList users={pageContainer.state.seenUsers} />

+ 4 - 9
src/client/styles/scss/_page_accessaries_modal.scss

@@ -1,12 +1,7 @@
 .grw-page-accessories-modal {
-  .grw-page-list-icon,
-  .grw-time-line-icon,
-  .grw-recent-changes-icon,
-  .grw-attachment-icon {
-    svg {
-      width: 20px;
-      height: 20px;
-      margin-right: 5px;
-    }
+  .nav-link svg {
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
   }
 }

+ 4 - 9
src/client/styles/scss/theme/_apply-colors.scss

@@ -249,14 +249,12 @@ pre:not(.hljs):not(.CodeMirror-line) {
 .top-of-table-contents {
   border-color: $bordercolor-nav-tabs;
 
-  .btn-page-list-icon,
-  .btn-time-line-icon,
-  .btn-recent-changes-icon,
-  .btn-attachment-icon {
+  .grw-btn-top-of-table {
     fill: $color-link;
   }
-  .btn-seen-user-list {
+  .grw-seen-user-list {
     border-color: $bordercolor-nav-tabs;
+
     .btn {
       color: $color-seen-user;
       &:active {
@@ -277,10 +275,7 @@ pre:not(.hljs):not(.CodeMirror-line) {
   .nav-title {
     color: $color-link;
   }
-  .grw-page-list-icon,
-  .grw-time-line-icon,
-  .grw-recent-changes-icon,
-  .grw-attachment-icon {
+  .nav-link svg {
     fill: $color-link;
   }
   .active-border {