Просмотр исходного кода

Merge pull request #4855 from weseek/imprv/83039-triangle-icon

Imprv/83039 triangle icon
Yuki Takei 4 лет назад
Родитель
Сommit
2639b41a23

+ 17 - 0
packages/app/src/components/Icons/TriangleIcon.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+
+const TriangleIcon = (): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="12"
+    height="12"
+    viewBox="0 0 12 12"
+  >
+    <g transform="translate(18194 -6790)">
+      <rect width="12" height="12" transform="translate(-18194 6790)" fill="none" />
+      <path d="M5.2,1.067a1,1,0,0,1,1.6,0l4,5.333A1,1,0,0,1,10,8H2a1,1,0,0,1-.8-1.6Z" transform="translate(-18183 6790) rotate(90)" />
+    </g>
+  </svg>
+);
+
+export default TriangleIcon;

+ 5 - 1
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -11,6 +11,8 @@ import ClosableTextInput, { AlertInfo, AlertType } from '../../Common/ClosableTe
 import PageItemControl from '../../Common/Dropdown/PageItemControl';
 import PageItemControl from '../../Common/Dropdown/PageItemControl';
 import { IPageForPageDeleteModal } from '~/components/PageDeleteModal';
 import { IPageForPageDeleteModal } from '~/components/PageDeleteModal';
 
 
+import TriangleIcon from '~/components/Icons/TriangleIcon';
+
 
 
 interface ItemProps {
 interface ItemProps {
   itemNode: ItemNode
   itemNode: ItemNode
@@ -183,7 +185,9 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
           className={`grw-pagetree-button btn ${buttonClass}`}
           className={`grw-pagetree-button btn ${buttonClass}`}
           onClick={onClickLoadChildren}
           onClick={onClickLoadChildren}
         >
         >
-          <i className="icon-control-play"></i>
+          <div className="grw-triangle-icon">
+            <TriangleIcon />
+          </div>
         </button>
         </button>
         <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
         <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
           <p className="grw-pagetree-title m-auto">{nodePath.basename(page.path as string) || '/'}</p>
           <p className="grw-pagetree-title m-auto">{nodePath.basename(page.path as string) || '/'}</p>

+ 9 - 0
packages/app/src/styles/theme/_apply-colors-dark.scss

@@ -249,6 +249,15 @@ ul.pagination {
 .grw-sidebar {
 .grw-sidebar {
   // List
   // List
   @include override-list-group-item($color-list, $bgcolor-sidebar-list-group, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
   @include override-list-group-item($color-list, $bgcolor-sidebar-list-group, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
+
+  // Pagetree
+  .grw-pagetree {
+    .grw-triangle-icon {
+      svg {
+        fill: $gray-500;
+      }
+    }
+  }
 }
 }
 
 
 /*
 /*

+ 9 - 0
packages/app/src/styles/theme/_apply-colors-light.scss

@@ -166,6 +166,15 @@ $border-color: $border-color-global;
 .grw-sidebar {
 .grw-sidebar {
   // List
   // List
   @include override-list-group-item($color-list, $bgcolor-sidebar-list-group, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
   @include override-list-group-item($color-list, $bgcolor-sidebar-list-group, $color-list-hover, $bgcolor-list-hover, $color-list-active, $bgcolor-list-active);
+
+  // Pagetree
+  .grw-pagetree {
+    .grw-triangle-icon {
+      svg {
+        fill: $gray-400;
+      }
+    }
+  }
 }
 }
 
 
 /*
 /*