浏览代码

fix FileItem source icon position and copy

Artur Paikin 7 年之前
父节点
当前提交
1e2a722b08
共有 3 个文件被更改,包括 8 次插入9 次删除
  1. 3 5
      src/plugins/Dashboard/FileItem.js
  2. 1 0
      src/plugins/Dashboard/index.js
  3. 4 4
      src/scss/_dashboard.scss

+ 3 - 5
src/plugins/Dashboard/FileItem.js

@@ -86,14 +86,12 @@ module.exports = function fileItem (props) {
         }
         }
       </h4>
       </h4>
       <div class="UppyDashboardItem-status">
       <div class="UppyDashboardItem-status">
-        <div class="UppyDashboardItem-statusSize">${file.data.size ? prettyBytes(file.data.size) : ''}</div>
-        ${file.source
-          ? html`<div class="UppyDashboardItem-sourceIcon">
+        ${file.data.size && html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>`}
+        ${file.source && html`<div class="UppyDashboardItem-sourceIcon">
             ${acquirers.map(acquirer => {
             ${acquirers.map(acquirer => {
-              if (acquirer.id === file.source) return html`<span title="${acquirer.name}">${acquirer.icon()}</span>`
+              if (acquirer.id === file.source) return html`<span title="${props.i18n('fileSource')}: ${acquirer.name}">${acquirer.icon()}</span>`
             })}
             })}
           </div>`
           </div>`
-          : ''
         }
         }
       </div>
       </div>
       ${!uploadInProgressOrComplete
       ${!uploadInProgressOrComplete

+ 1 - 0
src/plugins/Dashboard/index.js

@@ -28,6 +28,7 @@ module.exports = class DashboardUI extends Plugin {
         dashboardTitle: 'Uppy Dashboard',
         dashboardTitle: 'Uppy Dashboard',
         copyLinkToClipboardSuccess: 'Link copied to clipboard.',
         copyLinkToClipboardSuccess: 'Link copied to clipboard.',
         copyLinkToClipboardFallback: 'Copy the URL below',
         copyLinkToClipboardFallback: 'Copy the URL below',
+        fileSource: 'File source',
         done: 'Done',
         done: 'Done',
         localDisk: 'Local Disk',
         localDisk: 'Local Disk',
         myDevice: 'My Device',
         myDevice: 'My Device',

+ 4 - 4
src/scss/_dashboard.scss

@@ -474,9 +474,8 @@
 }
 }
 
 
 .UppyDashboardItem-sourceIcon {
 .UppyDashboardItem-sourceIcon {
-  // color: rgba($color-white, 0.95);
-  position: relative;
-  left: 3px;
+  // position: relative;
+  // left: 3px;
   display: inline-block;
   display: inline-block;
   vertical-align: middle;
   vertical-align: middle;
   width: 7px;
   width: 7px;
@@ -605,8 +604,9 @@
 
 
 .UppyDashboardItem-statusSize {
 .UppyDashboardItem-statusSize {
   display: inline-block;
   display: inline-block;
-  vertical-align: middle;
+  vertical-align: bottom;
   text-transform: uppercase;
   text-transform: uppercase;
+  margin-right: 3px;
 }
 }
 
 
 .UppyDashboardItem-edit,
 .UppyDashboardItem-edit,