浏览代码

Final doc and style tweaks

Artur Paikin 7 年之前
父节点
当前提交
58fd15e437

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

@@ -466,7 +466,6 @@ module.exports = class Dashboard extends Plugin {
       handleClickOutside: this.handleClickOutside,
       handleInputChange: this.handleInputChange,
       handlePaste: this.handlePaste,
-      showProgressDetails: this.opts.showProgressDetails,
       inline: this.opts.inline,
       showPanel: this.showPanel,
       hideAllPanels: this.hideAllPanels,

+ 1 - 1
src/scss/_common.scss

@@ -176,7 +176,7 @@
   border-radius: 4px;
   font-size: 13px;
   line-height: 1.5;
-  padding: 4px 8px;
+  padding: 6px 8px;
 }
 
   .uppy-Dashboard--wide .uppy-c-textInput {

+ 5 - 5
src/scss/_dashboard.scss

@@ -53,7 +53,7 @@
 .uppy-Dashboard-poweredBy {
   position: absolute;
   right: 4px;
-  bottom: -20px;
+  bottom: -23px;
   font-size: 11px;
   font-weight: 300;
   color: rgba($color-gray, 0.8);
@@ -419,11 +419,11 @@
   }
 
 .uppy-Dashboard.drag .uppy-Dashboard-innerWrap  {
-  background-color: darken($color-white, 15%)
+  background-color: darken($color-white, 20%)
 }
 
 .uppy-Dashboard.drag .uppy-Dashboard-files--noFiles {
-  border-color: darken(#E4E4E4, 20%);
+  border-color: darken($color-white, 20%);
 }
 
 // .uppy-Dashboard-bgIcon {
@@ -496,7 +496,7 @@
   list-style: none;
   margin: 10px 0;
   position: relative;
-  background-color: $color-white;
+  // background-color: $color-white;
   display: flex;
   align-items: center;
   border-bottom: 1px solid lighten($color-gray, 35%);
@@ -640,7 +640,7 @@
   // padding: 10px 19px 0 25px;
   padding-left: 15px;
   position: relative;
-  max-width: 70%;
+  max-width: 65%;
 
   .uppy-Dashboard--wide & {
     width: 100%;

+ 1 - 1
src/scss/_statusbar.scss

@@ -39,7 +39,7 @@
 }
 
 .uppy-StatusBar:not([aria-hidden=true]).is-waiting {
-  background-color: $color-white;
+  background-color: darken($color-white, 2%);
   height: 65px;
   border-top: 1px solid rgba($color-gray, 0.3);
 }

+ 5 - 1
src/scss/_url.scss

@@ -10,9 +10,13 @@
 .uppy-Url-input {
   width: 90%;
   max-width: 650px;
-  margin-bottom: 30px;
+  margin-bottom: 15px;
 }
 
+  .uppy-Dashboard--wide .uppy-Url-input  {
+    margin-bottom: 30px;
+  }
+
 .uppy-Url-importButton {
   padding: 13px 25px;
 }

+ 6 - 3
website/src/docs/dashboard.md

@@ -122,7 +122,10 @@ Maximum height of the Dashboard in pixels. Used when `inline: true`.
 
 ### `showProgressDetails: false`
 
-Show progress bars for the uploads.
+By default, progress in StatusBar is shown as simple percentage. If you’d like to also display remaining upload size and time, set this to `true`.
+
+`showProgressDetails: false`: Uploading: 45%
+`showProgressDetails: true`: Uploading: 45%・43 MB of 101 MB・8s left
 
 ### `hideUploadButton: false`
 
@@ -166,9 +169,9 @@ By default when Dashboard modal is open, it will disable page scrolling, so when
 
 ### `proudlyDisplayPoweredByUppy: true`
 
-Uppy is provided for the world for free by the [Transloadit team](https://transloadit.com). In return, we ask that you consider keeping tiny Uppy logo at the bottom of the Dashboard, so that more people learn about Uppy. 
+Uppy is provided for the world for free by the [Transloadit team](https://transloadit.com). In return, we ask that you consider keeping a tiny Uppy logo at the bottom of the Dashboard, so that more people can discover and use Uppy. 
 
-This is entirely optional of course, just set this option to false if you wish.
+This is entirely optional of course, just set this option to false if you do not wish to display Uppy logo.
 
 ### `disableStatusBar: false`
 

+ 1 - 1
website/src/docs/statusbar.md

@@ -59,7 +59,7 @@ DOM element, CSS selector, or plugin to mount the StatusBar into.
 
 Hide StatusBar after upload is complete.
 
-# `showProgressDetails: false`
+### `showProgressDetails: false`
 
 By default, progress in StatusBar is shown as simple percentage. If you’d like to also display remaining upload size and time, set this to `true`.