From 1996c6a13bed7e9c0f478231d2ca4c88b90d8e03 Mon Sep 17 00:00:00 2001
From: Michael An <1822852997@qq.com>
Date: Tue, 11 Jun 2019 18:34:47 +0800
Subject: [PATCH] update

---
 frontend/src/css/dtable-page.css    | 10 ++++++++++
 frontend/src/pages/dtable/dtable.js | 23 +++++++++++------------
 media/img/data-base.svg             | 20 ++++++++++----------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/frontend/src/css/dtable-page.css b/frontend/src/css/dtable-page.css
index 467db0604e..fd2ae15ba3 100644
--- a/frontend/src/css/dtable-page.css
+++ b/frontend/src/css/dtable-page.css
@@ -4,9 +4,15 @@
   border-bottom: 2px solid #e3e3e3;
   font-size: 1rem;
 }
+.workspace .workspace-name .dropdown-toggle:after {
+  color: #929292;
+}
 .workspace .workspace-name:hover {
   border-bottom: 2px solid #202428;
 }
+.workspace .workspace-name:hover .dropdown-toggle:after {
+  color: #202428;
+}
 .workspace .add-table-btn {
   width: 42px;
   height: 42px;
@@ -27,6 +33,10 @@
 }
 .add-table-btn-container {
   align-items: center;
+  margin: 1rem 0 0.75rem;
+}
+.add-table-btn-container span {
+  margin-left: 1rem;
 }
 .add-workspace {
   color: #929292;
diff --git a/frontend/src/pages/dtable/dtable.js b/frontend/src/pages/dtable/dtable.js
index 53b8d3412d..c8688f0639 100644
--- a/frontend/src/pages/dtable/dtable.js
+++ b/frontend/src/pages/dtable/dtable.js
@@ -95,7 +95,7 @@ class Table extends Component {
 
     return (
       <tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} className={this.state.active ? 'tr-highlight' : ''}>
-        <td><img src={siteRoot + 'media/img/data-base.svg'} alt="" width="20"/></td>
+        <td><img src={siteRoot + 'media/img/data-base.svg'} alt="" width="24"/></td>
         <td>
           {this.state.isTableRenaming &&
             <Rename
@@ -260,7 +260,7 @@ class Workspace extends Component {
 
     return(
       <div className="workspace my-2">
-        <div className="d-flex">
+        <Fragment>
           {this.state.isWorkspaceRenaming &&
             <Rename
               hasSuffix={false}
@@ -271,16 +271,15 @@ class Workspace extends Component {
           }
           {!this.state.isWorkspaceRenaming &&
             <Fragment>
-              <span className="workspace-name mb-2">{workspace.name}</span>
-              <Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down">
+              <Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down" className="workspace-name">
                 <DropdownToggle
                   caret={true}
-                  tag='i'
+                  tag='span'
                   title={gettext('More Operations')}
                   data-toggle="dropdown" 
                   aria-expanded={this.state.dropdownOpen}
-                  className="attr-action-icon"
                 >
+                  <span className="mb-2">{workspace.name}</span>
                 </DropdownToggle>
                 <DropdownMenu className="drop-list" right={true}>
                   <DropdownItem onClick={this.onRenameWorkspaceCancel}>{gettext('Rename')}</DropdownItem>
@@ -296,8 +295,8 @@ class Workspace extends Component {
               }
             </Fragment>
           }
-        </div>
-        <div className="my-2 d-flex add-table-btn-container">
+        </Fragment>
+        <div className="d-flex add-table-btn-container">
           <div className="add-table-btn cursor-pointer" onClick={this.onAddTable}>
             <i className="fa fa-plus"></i>
           </div>
@@ -307,11 +306,11 @@ class Workspace extends Component {
               createTable={this.createTable}
             />
           }
-          <span className="ml-2">{gettext('Add a DTable')}</span>
+          <span>{gettext('Add a DTable')}</span>
         </div>
-        <table width="100%" className="table table-vcenter">
+        <table width="100%" className="table-vcenter">
           <colgroup>
-            <col width="5%"/><col width="30%"/><col width="30%"/><col width="30%"/><col width="5%"/>
+            <col width="4%"/><col width="31%"/><col width="30%"/><col width="27%"/><col width="8%"/>
           </colgroup>
           <tbody>
             {this.state.tableList.map((table, index) => {
@@ -442,7 +441,7 @@ class DTable extends Component {
                     />
                   );
                 })}
-                <div>
+                <div className="my-2">
                   <span className="add-workspace cursor-pointer" onClick={this.onAddWorkspace}>
                     <i className="fa fa-plus"></i>{' '}{gettext('Add a Workspace')}
                   </span>
diff --git a/media/img/data-base.svg b/media/img/data-base.svg
index f53d7a1d3e..b4098af7f5 100644
--- a/media/img/data-base.svg
+++ b/media/img/data-base.svg
@@ -9,16 +9,16 @@
 <desc>Created with Sketch.</desc>
 <g id="Symbols">
 	<g id="data-base">
-		<g id="形状">
-			<path class="st0" d="M27.2,1.8C24.4,0.6,20.4,0,16,0S7.6,0.6,4.8,1.8C1.6,3.2,0,4.8,0,6.6v18.6C0,27,1.6,28.8,4.8,30
-				c2.8,1.4,6.8,2,11.2,2s8.4-0.6,11.2-1.8c3-1.2,4.8-3,4.8-4.8V6.6C32,4.8,30.4,3.2,27.2,1.8L27.2,1.8z M25.4,10
-				c-2.6,1-6.2,1.4-9.4,1.4c-3.4,0-6.8-0.4-9.4-1.4c-3-0.8-4.4-2-4.4-3.4c0-1.2,1.6-2.4,4.4-3.4C9.2,2.4,12.6,2,16,2
-				c3.2,0,6.8,0.6,9.4,1.4c2.8,1,4.4,2.2,4.4,3.4S28.4,9.2,25.4,10L25.4,10z M25.6,15.8c-2.6,0.8-6.2,1.4-9.6,1.4s-6.8-0.6-9.6-1.4
-				c-2.8-1-4.4-2.2-4.4-3.4v-2.2C4,11,5.4,12,7.6,12.4c2.6,0.6,5.4,1,8.4,1s5.8-0.4,8.4-1C26.6,12,28,11,30,10.2v2.4
-				C30,13.6,28.4,14.8,25.6,15.8L25.6,15.8z M25.6,22.2C23,23,19.4,23.6,16,23.6S9.2,23,6.4,22.2c-2.8-0.8-4.4-2-4.4-3.4v-3
-				c2,1,3.4,1.8,5.6,2.4c2.6,0.6,5.4,1,8.4,1s5.8-0.4,8.4-1c2.2-0.6,3.6-1.4,5.6-2.4v3C30,20.2,28.4,21.4,25.6,22.2L25.6,22.2z
-				 M16,30c-3.4,0-6.8-0.6-9.6-1.4c-2.8-0.8-4.4-2-4.4-3.2v-3c2,1,3.4,1.8,5.6,2.4c2.4,0.6,5.4,1,8.2,1c3,0,5.8-0.4,8.4-1
-				c2.4-0.6,3.8-1.4,5.8-2.4v3c0,1.2-1.6,2.4-4.4,3.4C23,29.6,19.2,30,16,30L16,30z"/>
+		<g id="形状" transform="translate(2.000000, 2.000000)">
+			<path class="st0" d="M23.8,1.6C21.4,0.5,17.9,0,14,0S6.7,0.5,4.2,1.6C1.4,2.8,0,4.2,0,5.8V22c0,1.6,1.4,3.2,4.2,4.2
+				C6.7,27.5,10.1,28,14,28s7.4-0.5,9.8-1.6c2.6-1,4.2-2.6,4.2-4.2V5.8C28,4.2,26.6,2.8,23.8,1.6L23.8,1.6z M22.2,8.8
+				C20,9.6,16.8,10,14,10c-3,0-5.9-0.4-8.2-1.2C3.2,8.1,1.9,7,1.9,5.8c0-1.1,1.4-2.1,3.9-3c2.3-0.7,5.2-1,8.2-1c2.8,0,6,0.5,8.2,1.2
+				c2.4,0.9,3.9,1.9,3.9,3S24.9,8.1,22.2,8.8L22.2,8.8z M22.4,13.8c-2.3,0.7-5.4,1.2-8.4,1.2s-5.9-0.5-8.4-1.2
+				c-2.4-0.9-3.8-1.9-3.8-3V8.9c1.8,0.7,3,1.6,4.9,1.9c2.3,0.5,4.7,0.9,7.3,0.9s5.1-0.4,7.4-0.9c1.9-0.4,3.1-1.2,4.9-1.9V11
+				C26.2,11.9,24.9,12.9,22.4,13.8L22.4,13.8z M22.4,19.4c-2.3,0.7-5.4,1.2-8.4,1.2s-5.9-0.5-8.4-1.2c-2.4-0.7-3.8-1.8-3.8-3v-2.6
+				c1.8,0.9,3,1.6,4.9,2.1c2.3,0.5,4.7,0.9,7.3,0.9s5.1-0.3,7.4-0.9c1.9-0.5,3.1-1.2,4.9-2.1v2.6C26.2,17.7,24.9,18.7,22.4,19.4
+				L22.4,19.4z M14,26.2c-3,0-5.9-0.5-8.4-1.2c-2.4-0.7-3.8-1.8-3.8-2.8v-2.6c1.8,0.9,3,1.6,4.9,2.1c2.1,0.5,4.7,0.9,7.2,0.9
+				c2.6,0,5.1-0.4,7.3-0.9c2.1-0.5,3.3-1.2,5.1-2.1v2.6c0,1-1.4,2.1-3.9,3C20.1,25.9,16.8,26.2,14,26.2L14,26.2z"/>
 		</g>
 	</g>
 </g>