Просмотр исходного кода

Correct font sizes; Improved Add icon

Alexander Zaytsev 6 лет назад
Родитель
Сommit
c70409c006

+ 3 - 3
packages/@uppy/core/src/_common.scss

@@ -119,7 +119,7 @@
 }
 }
 
 
   .uppy-size--md .uppy-c-textInput {
   .uppy-size--md .uppy-c-textInput {
-    font-size: 15px;
+    font-size: 14px;
     line-height: 1.8;
     line-height: 1.8;
     padding: 8px 12px;
     padding: 8px 12px;
   }
   }
@@ -158,7 +158,7 @@
 }
 }
 
 
   .uppy-size--md .uppy-c-btn-primary {
   .uppy-size--md .uppy-c-btn-primary {
-    font-size: 15px;
+    font-size: 14px;
     padding: 13px 22px;
     padding: 13px 22px;
   }
   }
 
 
@@ -181,7 +181,7 @@
 }
 }
 
 
   .uppy-size--md .uppy-c-btn-link {
   .uppy-size--md .uppy-c-btn-link {
-    font-size: 15px;
+    font-size: 14px;
     padding: 13px 28px;
     padding: 13px 28px;
     // border-radius: 4px;
     // border-radius: 4px;
   }
   }

+ 2 - 2
packages/@uppy/dashboard/src/components/PickerPanelTopBar.js

@@ -94,8 +94,8 @@ function PanelTopBar (props) {
           aria-label={props.i18n('addMoreFiles')}
           aria-label={props.i18n('addMoreFiles')}
           title={props.i18n('addMoreFiles')}
           title={props.i18n('addMoreFiles')}
           onclick={() => props.toggleAddFilesPanel(true)}>
           onclick={() => props.toggleAddFilesPanel(true)}>
-          <svg class="UppyIcon" width="15" height="15" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg">
-            <path d="M7,6 L13,6 L13,7 L7,7 L7,13 L6,13 L6,7 L0,7 L0,6 L6,6 L6,0 L7,0 L7,6 Z" />
+          <svg class="UppyIcon" width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+            <path d="M7.5 6H13a.5.5 0 0 1 .5.5V7a.5.5 0 0 1-.5.5H7.5V13a.5.5 0 0 1-.5.5h-.5A.5.5 0 0 1 6 13V7.5H.5A.5.5 0 0 1 0 7v-.5A.5.5 0 0 1 .5 6H6V.5a.5.5 0 0 1 .5-.5H7a.5.5 0 0 1 .5.5V6z" />
           </svg>
           </svg>
         </button>
         </button>
       }
       }

+ 6 - 16
packages/@uppy/dashboard/src/style.scss

@@ -206,7 +206,7 @@
 }
 }
 
 
 .uppy-DashboardTabs-title {
 .uppy-DashboardTabs-title {
-  font-size: 15px;
+  font-size: 14px;
   line-height: 30px;
   line-height: 30px;
   font-weight: 400;
   font-weight: 400;
   margin: 0;
   margin: 0;
@@ -215,7 +215,7 @@
   color: $color-asphalt-gray;
   color: $color-asphalt-gray;
 
 
   .uppy-size--md & {
   .uppy-size--md & {
-    font-size: 17px;
+    font-size: 16px;
     line-height: 40px;
     line-height: 40px;
   }
   }
 }
 }
@@ -405,14 +405,10 @@
 
 
 .uppy-DashboardContent-back {
 .uppy-DashboardContent-back {
   @include reset-button;
   @include reset-button;
-  font-size: 13px;
+  font-size: 14px;
   font-weight: 500;
   font-weight: 500;
   cursor: pointer;
   cursor: pointer;
   color: $color-cornflower-blue;
   color: $color-cornflower-blue;
-
-  .uppy-size--md & {
-    font-size: 15px;
-  }
 }
 }
 
 
 .uppy-DashboardContent-addMore {
 .uppy-DashboardContent-addMore {
@@ -420,15 +416,9 @@
   font-weight: 500;
   font-weight: 500;
   cursor: pointer;
   cursor: pointer;
   color: $color-cornflower-blue;
   color: $color-cornflower-blue;
-  stroke: $color-cornflower-blue;
-  stroke-width: 0.7px;
-  width: 13px;
-  height: 13px;
-
-  .uppy-size--md & {
-    width: 15px;
-    height: 15px;
-  }
+  width: 24px;
+  height: 24px;
+  padding: 5px;
 }
 }
 
 
   .uppy-DashboardContent-addMore svg {
   .uppy-DashboardContent-addMore svg {