Przeglądaj źródła

Get rid of $color-almost-white

Alexander Zaytsev 6 lat temu
rodzic
commit
54f8e85906

+ 2 - 2
packages/@uppy/core/src/_variables.scss

@@ -6,8 +6,8 @@ $font-family-base: system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Robot
 
 $color-black: #333 !default;
 $color-gray: #939393 !default;
-$color-asphalt-gray: #525252 !default;
-$color-lightgray: #eaeaea !default;
+// $color-asphalt-gray: #525252 !default;
+// $color-lightgray: #eaeaea !default;
 $color-almost-white: #fafafa !default;
 $color-white: #fff !default;
 $color-red: #d32f2f !default;

+ 8 - 8
packages/@uppy/dashboard/src/style.scss

@@ -112,7 +112,7 @@
 
 .uppy-Dashboard-inner {
   position: relative;
-  background-color: $color-almost-white;
+  background-color: $gray-50;
   max-width: 100%; /* no !important */
   max-height: 100%; /* no !important */
   // min-width: 290px;
@@ -376,7 +376,7 @@
   width: 100%;
   border-bottom: 1px solid $gray-200;
   z-index: $zIndex-4;
-  background-color: $color-almost-white;
+  background-color: $gray-50;
   padding: 0 10px;
 
   .uppy-size--md & {
@@ -462,8 +462,8 @@
   bottom: 0;
   left: 0;
   right: 0;
-  background: $color-almost-white;
-  background: linear-gradient(0deg, $color-almost-white 35%, rgba($color-almost-white, 0.85) 100%);
+  background: $gray-50;
+  background: linear-gradient(0deg, $gray-50 35%, rgba($gray-50, 0.85) 100%);
   box-shadow: 0 0 10px 5px rgba($color-black, 0.15);
   overflow: hidden;
   z-index: $zIndex-5;
@@ -548,15 +548,15 @@
   }
 
 .uppy-Dashboard.drag .uppy-Dashboard-innerWrap {
-  background-color: darken($color-almost-white, 25%)
+  background-color: darken($gray-50, 25%)
 }
 
 .uppy-Dashboard.drag .uppy-Dashboard-AddFilesPanel {
-  background: darken($color-almost-white, 20%)
+  background: darken($gray-50, 20%)
 }
 
 .uppy-Dashboard.drag .uppy-Dashboard-files--noFiles {
-  border-color: darken($color-almost-white, 20%);
+  border-color: darken($gray-50, 20%);
 }
 
 .uppy-Dashboard-dropFilesTitle {
@@ -1087,7 +1087,7 @@ a.uppy-Dashboard-poweredBy {
   display: flex;
   align-items: center;
   padding: 0 15px;
-  background-color: $color-almost-white;
+  background-color: $gray-50;
 }
 
   .uppy-size--md .uppy-Dashboard-actions {

+ 1 - 1
packages/@uppy/provider-views/src/style.scss

@@ -176,7 +176,7 @@
 
   .uppy-ProviderBrowser-searchInput:focus {
     outline: 0;
-    background-color: darken($color-almost-white, 2%);
+    background-color: $gray-100;
 
     & + .uppy-ProviderBrowser-searchIcon {
       color: rgba($color-gray, 0.8);

+ 1 - 1
packages/@uppy/status-bar/src/style.scss

@@ -181,7 +181,7 @@
   width: 100%;
   position: static;
   padding: 0 15px;
-  background-color: $color-almost-white;
+  background-color: $gray-50;
 }
 
 .uppy-StatusBar-actionCircleBtn {