kaho-y 4 лет назад
Родитель
Сommit
5dfa0fdc0e

+ 2 - 2
src/client/js/components/Sidebar/CustomSidebar.jsx

@@ -61,8 +61,8 @@ const CustomSidebar = (props) => {
           Custom Sidebar
           <a className="h6 ml-2" href="/Sidebar"><i className="icon-pencil"></i></a>
         </h3>
-        <button type="button" className="btn btn-sm ml-auto" onClick={fetchDataAndRenderHtml}>
-          <i className="icon icon-reload grw-icon-reload"></i>
+        <button type="button" className="btn btn-sm ml-auto grw-btn-reload-cs" onClick={fetchDataAndRenderHtml}>
+          <i className="icon icon-reload"></i>
         </button>
       </div>
       { isMounted && markdown == null && <SidebarNotFound /> }

+ 2 - 3
src/client/js/components/Sidebar/RecentChanges.jsx

@@ -72,7 +72,6 @@ class RecentChanges extends React.Component {
       );
     });
 
-
     return (
       <li className="list-group-item py-3 px-0">
         <div className="d-flex w-100">
@@ -113,8 +112,8 @@ class RecentChanges extends React.Component {
         <div className="grw-sidebar-content-header p-3 d-flex">
           <h3 className="mb-0">{t('Recent Changes')}</h3>
           {/* <h3 className="mb-0">{t('Recent Created')}</h3> */} {/* TODO: impl switching */}
-          <button type="button" className="btn btn-sm ml-auto" onClick={this.reloadData}>
-            <i className="icon icon-reload grw-icon-reload"></i>
+          <button type="button" className="btn btn-sm ml-auto grw-btn-reload-rc" onClick={this.reloadData}>
+            <i className="icon icon-reload"></i>
           </button>
         </div>
         <div className="grw-sidebar-content-body grw-recent-changes p-3">

+ 1 - 1
src/client/styles/scss/_recent-changes.scss

@@ -1,5 +1,5 @@
 .grw-sidebar-content-header {
-  .grw-icon-reload {
+  .grw-btn-reload-rc {
     font-size: 18px;
   }
 }

+ 7 - 2
src/client/styles/scss/theme/_apply-colors.scss

@@ -15,6 +15,8 @@ $bordercolor-nav-tabs-hover: $gray-200 $gray-200 $bordercolor-nav-tabs !default;
 $color-nav-tabs-link-active: $gray-600 !default;
 $bordercolor-nav-tabs-active: $bordercolor-nav-tabs $bordercolor-nav-tabs $bgcolor-global !default;
 $color-seen-user: #549c79 !default;
+$reload-btn-rc-color: $gray-500;
+$reload-btn-cs-color: $gray-500;
 
 // override bootstrap variables
 $body-bg: $bgcolor-global;
@@ -265,8 +267,11 @@ ul.pagination {
   }
 
   .grw-sidebar-content-header {
-    .grw-icon-reload {
-      color: $gray-500;
+    .grw-btn-reload-rc {
+      color: $reload-btn-rc-color;
+    }
+    .grw-btn-reload-cs {
+      color: $reload-btn-cs-color;
     }
   }