Parcourir la source

Tweak Upload button

Artur Paikin il y a 7 ans
Parent
commit
1ab2c88a54
2 fichiers modifiés avec 27 ajouts et 23 suppressions
  1. 4 2
      src/plugins/StatusBar/StatusBar.js
  2. 23 21
      src/scss/_statusbar.scss

+ 4 - 2
src/plugins/StatusBar/StatusBar.js

@@ -113,8 +113,10 @@ const UploadBtn = (props) => {
   const uploadBtnClassNames = classNames(
   const uploadBtnClassNames = classNames(
     'uppy-u-reset',
     'uppy-u-reset',
     'uppy-c-btn',
     'uppy-c-btn',
-    { 'uppy-c-btn-primary': props.uploadState === statusBarStates.STATE_WAITING },
-    { 'uppy-StatusBar-actionBtn uppy-StatusBar-actionBtn--upload': props.uploadState !== statusBarStates.STATE_WAITING }
+    'uppy-StatusBar-actionBtn',
+    'uppy-StatusBar-actionBtn--upload',
+    { 'uppy-c-btn-primary': props.uploadState === statusBarStates.STATE_WAITING }
+    // { 'uppy-StatusBar-actionBtn uppy-StatusBar-actionBtn--upload': props.uploadState !== statusBarStates.STATE_WAITING }
   )
   )
 
 
   return <button type="button"
   return <button type="button"

+ 23 - 21
src/scss/_statusbar.scss

@@ -1,7 +1,8 @@
 .uppy-StatusBar {
 .uppy-StatusBar {
+  display: flex;
   position: relative;
   position: relative;
-  height: 30px;
-  line-height: 30px;
+  height: 35px;
+  line-height: 35px;
   font-size: 12px;
   font-size: 12px;
   font-weight: 400;
   font-weight: 400;
   color: $color-white;
   color: $color-white;
@@ -17,10 +18,6 @@
     font-size: 14px;
     font-size: 14px;
   }
   }
 
 
-  // .uppy-StatusBar.uppy-StatusBar--detailedProgress  {
-  //   height: 47px;
-  // }
-
 .uppy-StatusBar[aria-hidden=true] {
 .uppy-StatusBar[aria-hidden=true] {
   overflow-y: hidden;
   overflow-y: hidden;
   height: 0;
   height: 0;
@@ -112,12 +109,6 @@
     margin-right: 7px;
     margin-right: 7px;
   }
   }
 
 
-  // button.uppy-StatusBar-statusIndicator {
-  //   @include reset-button;
-  //   margin-right: 15px;
-  //   cursor: pointer;
-  // }
-
 .uppy-StatusBar-actions {
 .uppy-StatusBar-actions {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
@@ -129,28 +120,39 @@
 }
 }
 
 
 .uppy-StatusBar.is-waiting .uppy-StatusBar-actions {
 .uppy-StatusBar.is-waiting .uppy-StatusBar-actions {
-  font-size: 1.1em;
-  left: 20px;
-  right: initial;
+  width: 100%;
+  position: static;
+  padding: 0 15px;
 }
 }
 
 
 .uppy-StatusBar-actionBtn {
 .uppy-StatusBar-actionBtn {
-  font-size: 0.85em;
-  padding: 4px 6px;
-  border-radius: 2px;
+  font-size: 12px;
+  padding: 6px;
+  border-radius: 4px;
 }
 }
 
 
   .uppy-Dashboard--wide .uppy-StatusBar-actionBtn {
   .uppy-Dashboard--wide .uppy-StatusBar-actionBtn {
     padding: 7px 10px;
     padding: 7px 10px;
   }
   }
 
 
+  .uppy-StatusBar.is-waiting .uppy-StatusBar-actionBtn--upload {
+    width: 100%;
+    padding: 15px 10px;
+  }
+
+    .uppy-Dashboard--wide .uppy-StatusBar.is-waiting .uppy-StatusBar-actionBtn--upload {
+      padding: 13px 28px;
+      width: auto;
+    }
+
   .uppy-StatusBar-actionBtn:not(:last-child) {
   .uppy-StatusBar-actionBtn:not(:last-child) {
     margin-right: 10px;
     margin-right: 10px;
   }
   }
 
 
-  .uppy-StatusBar-actionBtn--upload {
-    background-color: $color-white;
-    color: $color-cornflower-blue;
+  .uppy-StatusBar:not(.is-waiting) .uppy-StatusBar-actionBtn--upload {
+    background-color: transparent;
+    border: 1px solid $color-white;
+    color: $color-white;
   }
   }
 
 
   .uppy-StatusBar-actionBtn--retry {
   .uppy-StatusBar-actionBtn--retry {