chore: sync ant-design v3.19.4 (#3585)

NG-ZORRO · Jun 16, 2019 · f7b5d35 · f7b5d35
1 parent 42daeba
commit f7b5d35
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 16 deletions.
diff --git a/components/collapse/style/index.less b/components/collapse/style/index.less
@@ -37,9 +37,7 @@
         top: 50%;
         left: @padding-md;
         display: inline-block;
-        margin-top: 2px;
         font-size: @font-size-sm;
-        line-height: 46px;
         transform: translateY(-50%);
 
         & svg {

diff --git a/components/comment/style/index.less b/components/comment/style/index.less
@@ -27,25 +27,25 @@
     position: relative;
     flex: 1 1 auto;
     min-width: 1px;
-    font-size: 14px;
+    font-size: @comment-font-size-base;
     word-wrap: break-word;
 
     &-author {
       display: flex;
       justify-content: flex-start;
       margin-bottom: 4px;
-      font-size: 14px;
+      font-size: @comment-font-size-base;
       & > a,
       & > span {
         height: 18px;
         padding-right: 8px;
-        font-size: 12px;
+        font-size: @comment-font-size-sm;
         line-height: 18px;
       }
 
       &-name {
         color: @comment-author-name-color;
-        font-size: 14px;
+        font-size: @comment-font-size-base;
         transition: color 0.3s;
         > * {
           color: @comment-author-name-color;
@@ -76,7 +76,7 @@
       > span {
         padding-right: 10px;
         color: @comment-action-color;
-        font-size: 12px;
+        font-size: @comment-font-size-sm;
         cursor: pointer;
         transition: color 0.3s;
         user-select: none;

diff --git a/components/divider/style/index.less b/components/divider/style/index.less
@@ -88,8 +88,11 @@
 
   &-dashed {
     background: none;
-    border-top: 1px dashed @border-color-split;
+    border-color: @border-color-split;
+    border-style: dashed;
+    border-width: 1px 0 0;
   }
+
   &-horizontal&-with-text-center&-dashed,
   &-horizontal&-with-text-left&-dashed,
   &-horizontal&-with-text-right&-dashed {
@@ -99,4 +102,8 @@
       border-style: dashed none none;
     }
   }
+
+  &-vertical&-dashed {
+    border-width: 0 0 0 1px;
+  }
 }
diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
@@ -8,11 +8,13 @@
   height: @input-height-lg;
   padding: @input-padding-vertical-lg @input-padding-horizontal-lg;
   font-size: @font-size-lg;
+  line-height: @input-height-lg;
 }
 
 .input-sm() {
   height: @input-height-sm;
   padding: @input-padding-vertical-sm @input-padding-horizontal-sm;
+  line-height: @input-height-sm;
 }
 
 // input status
@@ -49,7 +51,7 @@
   padding: @input-padding-vertical-base @input-padding-horizontal-base;
   color: @input-color;
   font-size: @font-size-base;
-  line-height: @line-height-base;
+  line-height: @input-height-base;
   background-color: @input-bg;
   background-image: none;
   border: @border-width-base @border-style-base @input-border-color;

diff --git a/components/menu/style/index.less b/components/menu/style/index.less
@@ -43,6 +43,10 @@
       padding 0.15s @ease-in-out;
   }
 
+  &-submenu-selected {
+    color: @menu-highlight-color;
+  }
+
   &-item:active,
   &-submenu-title:active {
     background: @menu-item-active-bg;

diff --git a/components/page-header/style/index.less b/components/page-header/style/index.less
@@ -19,11 +19,10 @@
     padding: 4px 0;
     font-size: 16px;
     line-height: 100%;
-    cursor: pointer;
     &-button {
       .operation-unit();
-
       color: @text-color;
+      cursor: pointer;
     }
   }
 
@@ -65,10 +64,10 @@
       top: 16px;
       right: @page-header-padding-horizontal;
       > * {
-        margin-right: 8px;
+        margin-left: 8px;
       }
-      > *:last-child {
-        margin-right: 0;
+      > *:first-child {
+        margin-left: 0;
       }
     }
   }

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -452,6 +452,8 @@
 // ---
 @comment-padding-base: 16px 0;
 @comment-nest-indent: 44px;
+@comment-font-size-base: @font-size-base;
+@comment-font-size-sm: @font-size-sm;
 @comment-author-name-color: @text-color-secondary;
 @comment-author-time-color: #ccc;
 @comment-action-color: @text-color-secondary;

diff --git a/components/table/style/index.less b/components/table/style/index.less
@@ -599,7 +599,8 @@
     opacity: 0.9999;
 
     &::-webkit-scrollbar {
-      border-bottom: 1px solid @border-color-split;
+      border: 1px solid @border-color-split;
+      border-width: 0 0 1px 0;
     }
   }
 
@@ -613,6 +614,17 @@
     }
   }
 
+  // optimize header style of borderd table after hide extra scrollbar
+  &-bordered&-fixed-header &-scroll &-header {
+    &::-webkit-scrollbar {
+      border: 1px solid @border-color-split;
+      border-width: 1px 1px 1px 0;
+    }
+    &.@{table-prefix-cls}-hide-scrollbar .@{table-prefix-cls}-thead > tr > th:last-child {
+      border-right-color: transparent;
+    }
+  }
+
   &-fixed-left,
   &-fixed-right {
     position: absolute;

diff --git a/components/time-picker/style/index.less b/components/time-picker/style/index.less
@@ -225,3 +225,14 @@
     right: @control-padding-horizontal-sm - 1px;
   }
 }
+
+// Fix cursor height in safari
+// https://stackoverflow.com/q/3843408/3040605
+// https://browserstrangeness.github.io/css_hacks.html#safari
+@media not all and (min-resolution: 0.001dpcm) {
+  @supports (-webkit-appearance: none) and (stroke-color: transparent) {
+    .@{ant-prefix}-input {
+      line-height: @line-height-base;
+    }
+  }
+}
diff --git a/components/tree/style/index.less b/components/tree/style/index.less
@@ -244,7 +244,8 @@
       left: 12px;
       width: 1px;
       height: 100%;
-      margin: 22px 0;
+      height: calc(100% - 22px); // Remove additional height if support
+      margin: 22px 0 0;
       border-left: 1px solid @border-color-base;
       content: ' ';
     }