Merge pull request #27659 from shaodahong/merge-to-feature

chore: Merge master to feature
ant-design · Nov 9, 2020 · 5724a8b · 5724a8b
2 parents 0e6e185 + 1b7a642
commit 5724a8b
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 57 deletions.
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
@@ -11,6 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@master
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+
+      - name: checkout
+        if: github.event_name == 'push'
         uses: actions/checkout@master
 
       - name: install

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -15,6 +15,13 @@ timeline: true
 
 ---
 
+## 4.8.2
+
+`2020-11-09`
+
+- 🐞 Fix Pagination lost jumper margin style. [#27650](https://github.com/ant-design/ant-design/pull/27650)
+- 🐞 Fix Steps `type="navigation"` last item broken style. [#27654](https://github.com/ant-design/ant-design/pull/27654)
+
 ## 4.8.1
 
 `2020-11-08`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -15,6 +15,13 @@ timeline: true
 
 ---
 
+## 4.8.2
+
+`2020-11-09`
+
+- 🐞 修复 Pagination 快速跳转 margin 丢失的问题。[#27650](https://github.com/ant-design/ant-design/pull/27650)
+- 🐞 修复 Steps `type="navigation"` 最后一项的样式问题。[#27654](https://github.com/ant-design/ant-design/pull/27654)
+
 ## 4.8.1
 
 `2020-11-08`

diff --git a/components/pagination/style/rtl.less b/components/pagination/style/rtl.less
@@ -4,76 +4,52 @@
 
 @pagination-prefix-cls: ~'@{ant-prefix}-pagination';
 
-.@{pagination-prefix-cls} {
-  &-rtl {
-    direction: rtl;
+.@{pagination-prefix-cls}-rtl {
+  .@{pagination-prefix-cls}-total-text {
+    margin-right: 0;
+    margin-left: 8px;
   }
 
-  &-total-text {
-    .@{pagination-prefix-cls}-rtl & {
-      margin-right: 0;
-      margin-left: 8px;
-    }
+  .@{pagination-prefix-cls}-item,
+  .@{pagination-prefix-cls}-prev,
+  .@{pagination-prefix-cls}-jump-prev,
+  .@{pagination-prefix-cls}-jump-next {
+    margin-right: 0;
+    margin-left: 8px;
   }
 
-  &-item {
-    .@{pagination-prefix-cls}-rtl & {
-      margin-right: 0;
-      margin-left: 8px;
-    }
+  .@{pagination-prefix-cls}-slash {
+    margin: 0 5px 0 10px;
   }
 
-  &-prev,
-  &-jump-prev,
-  &-jump-next {
-    .@{pagination-prefix-cls}-rtl & {
+  .@{pagination-prefix-cls}-options {
+    margin-right: 16px;
+    margin-left: 0;
+
+    .@{pagination-prefix-cls}-options-size-changer.@{ant-prefix}-select {
       margin-right: 0;
       margin-left: 8px;
     }
-  }
-
-  &-slash {
-    .@{pagination-prefix-cls}-rtl & {
-      margin: 0 5px 0 10px;
-    }
-  }
-
-  &-options {
-    .@{pagination-prefix-cls}-rtl & {
-      margin-right: 16px;
-      margin-left: 0;
-    }
 
-    &-size-changer.@{ant-prefix}-select {
-      .@{pagination-prefix-cls}-rtl & {
-        margin-right: 0;
-        margin-left: 8px;
-      }
-    }
-
-    &-quick-jumper {
+    .@{pagination-prefix-cls}-options-quick-jumper {
       margin-left: 0;
     }
   }
 
-  &-simple &-simple-pager {
-    .@{pagination-prefix-cls}-rtl& {
+  &.@{pagination-prefix-cls}-simple {
+    .@{pagination-prefix-cls}-simple-pager {
       margin-right: 0;
       margin-left: 8px;
-    }
 
-    input {
-      .@{pagination-prefix-cls}-rtl& {
+      input {
         margin-right: 0;
         margin-left: 8px;
       }
     }
   }
 
-  &.mini &-options {
-    .@{pagination-prefix-cls}-rtl& {
-      margin-right: 2px;
-      margin-left: 0;
-    }
+  &.@{pagination-prefix-cls}.mini .@{pagination-prefix-cls}-options {
+    margin-right: 2px;
+    margin-left: 0;
   }
 }
diff --git a/components/steps/style/custom-icon.less b/components/steps/style/custom-icon.less
@@ -1,11 +1,11 @@
 .@{steps-prefix-cls}-item-custom {
-  .@{steps-prefix-cls}-item-icon {
+  > .@{steps-prefix-cls}-item-container > .@{steps-prefix-cls}-item-icon {
     height: auto;
     background: none;
     border: 0;
     > .@{steps-prefix-cls}-icon {
       top: @steps-icon-custom-top;
-      left: 4.5px;
+      left: 0.5px;
       width: @steps-icon-custom-size;
       height: @steps-icon-custom-size;
       font-size: @steps-icon-custom-font-size;

diff --git a/components/steps/style/index.less b/components/steps/style/index.less
@@ -41,7 +41,7 @@
   }
 
   &:last-child {
-    flex: none !important;
+    flex: none;
   }
 
   &:last-child > &-container > &-tail,

diff --git a/components/steps/style/vertical.less b/components/steps/style/vertical.less
@@ -1,25 +1,29 @@
 .@{steps-prefix-cls}-vertical {
   display: flex;
   flex-direction: column;
-  .@{steps-prefix-cls}-item {
+
+  > .@{steps-prefix-cls}-item {
     display: block;
     flex: 1 0 auto;
     padding-left: 0;
     overflow: visible;
 
-    &-icon {
+    .@{steps-prefix-cls}-item-icon {
       float: left;
       margin-right: @steps-vertical-icon-width;
     }
-    &-content {
+
+    .@{steps-prefix-cls}-item-content {
       display: block;
       min-height: 48px;
       overflow: hidden;
     }
-    &-title {
+
+    .@{steps-prefix-cls}-item-title {
       line-height: @steps-icon-size;
     }
-    &-description {
+
+    .@{steps-prefix-cls}-item-description {
       padding-bottom: 12px;
     }
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "4.8.1",
+  "version": "4.8.2",
   "description": "An enterprise-class UI design language and React components implementation",
   "title": "Ant Design",
   "keywords": [