mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-06 16:06:28 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

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

Browse Source 
chore: Merge master to feature
This commit is contained in:
偏右 2020-11-09 19:29:53 +08:00 committed by GitHub
commit 5724a8b3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ui.yml vendored
View File

@ -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

7
CHANGELOG.en-US.md
View File

@ -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`

7
CHANGELOG.zh-CN.md
View File

@ -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`

80
components/pagination/style/rtl.less
View File

@ -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 & {
.@{pagination-prefix-cls}-item,
.@{pagination-prefix-cls}-prev,
.@{pagination-prefix-cls}-jump-prev,
.@{pagination-prefix-cls}-jump-next {
margin-right: 0;
margin-left: 8px;
}
.@{pagination-prefix-cls}-slash {
margin: 0 5px 0 10px;
}
.@{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;
}
}
&-item {
.@{pagination-prefix-cls}-rtl & {
margin-right: 0;
margin-left: 8px;
}
}
&-prev,
&-jump-prev,
&-jump-next {
.@{pagination-prefix-cls}-rtl & {
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;
}
}

4
components/steps/style/custom-icon.less
View File

@ -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;

2
components/steps/style/index.less
View File

@ -41,7 +41,7 @@
}
&:last-child {
flex: none !important;
flex: none;
}
&:last-child > &-container > &-tail,

14
components/steps/style/vertical.less
View File

@ -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;
}
}

2
package.json
View File

@ -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": [