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

Merge pull request #2802 from weseek/imprv/gw3891-my-drafts-redesign

Imprv/gw3891 my drafts redesign
oshikishintaro 5 лет назад
Родитель
Сommit
27a9eb9a16

+ 7 - 6
src/client/js/components/MyDraftList/Draft.jsx

@@ -82,20 +82,21 @@ class Draft extends React.Component {
 
 
   renderAccordionTitle(isExist) {
   renderAccordionTitle(isExist) {
     const { isPanelExpanded } = this.state;
     const { isPanelExpanded } = this.state;
-
-    const iconClass = isPanelExpanded ? 'caret-opened' : '';
+    const { t } = this.props;
+    const iconClass = isPanelExpanded ? 'fa-rotate-90' : '';
 
 
     return (
     return (
       <span>
       <span>
-        <i className={`caret ${iconClass}`}></i>
-        <span className="mx-2" onClick={() => this.setState({ isPanelExpanded: !isPanelExpanded })}>
+
+        <span className="mr-2 draft-path" onClick={() => this.setState({ isPanelExpanded: !isPanelExpanded })}>
+          <i className={`fa fa-fw fa-angle-right mr-2 ${iconClass}`}></i>
           {this.props.path}
           {this.props.path}
         </span>
         </span>
         { isExist && (
         { isExist && (
-          <span>({this.props.t('page exists')})</span>
+          <span className="badge badge-warning">{t('page exists')}</span>
         ) }
         ) }
         { !isExist && (
         { !isExist && (
-          <span className="badge badge-secondary">draft</span>
+          <span className="badge badge-info">draft</span>
         ) }
         ) }
 
 
         <a className="ml-2" href={this.props.path}><i className="icon icon-login"></i></a>
         <a className="ml-2" href={this.props.path}><i className="icon icon-login"></i></a>

+ 6 - 5
src/client/js/components/MyDraftList/MyDraftList.jsx

@@ -134,15 +134,16 @@ class MyDraftList extends React.Component {
     const totalCount = this.state.totalDrafts;
     const totalCount = this.state.totalDrafts;
 
 
     return (
     return (
-      <div className="page-list-container-create">
-
+      <div className="page-list-container-create ">
+        <h2>My Drafts</h2>
+        <hr />
         { totalCount === 0
         { totalCount === 0
-          && <span>No drafts yet.</span>
+          && <span className="mt-2">No drafts yet.</span>
         }
         }
 
 
         { totalCount > 0 && (
         { totalCount > 0 && (
           <React.Fragment>
           <React.Fragment>
-            <div className="d-flex justify-content-between">
+            <div className="d-flex justify-content-between mt-2">
               <h4>Total: {totalCount} drafts</h4>
               <h4>Total: {totalCount} drafts</h4>
               <div className="align-self-center">
               <div className="align-self-center">
                 <button type="button" className="btn btn-sm btn-outline-danger" onClick={this.clearAllDrafts}>
                 <button type="button" className="btn btn-sm btn-outline-danger" onClick={this.clearAllDrafts}>
@@ -152,7 +153,7 @@ class MyDraftList extends React.Component {
               </div>
               </div>
             </div>
             </div>
 
 
-            <div className="tab-pane mt-5 accordion" id="draft-list">
+            <div className="tab-pane mt-2 accordion" id="draft-list">
               {draftList}
               {draftList}
             </div>
             </div>
             <PaginationWrapper
             <PaginationWrapper

+ 3 - 9
src/client/styles/scss/_draft.scss

@@ -1,14 +1,5 @@
 .draft-list-item {
 .draft-list-item {
   .panel-heading {
   .panel-heading {
-    .caret {
-      transition: 0.4s;
-      transform: rotate(-90deg);
-
-      &.caret-opened {
-        transform: rotate(0deg);
-      }
-    }
-
     .icon-container {
     .icon-container {
       a:hover {
       a:hover {
         text-decoration: unset;
         text-decoration: unset;
@@ -30,4 +21,7 @@
   .draft-copy {
   .draft-copy {
     cursor: pointer;
     cursor: pointer;
   }
   }
+  .draft-path {
+    cursor: pointer;
+  }
 }
 }