test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-04 13:08:41 +08:00
Code Issues Actions 100 Packages Projects Releases Wiki Activity

Merge pull request #28177 from ant-design/master

Browse Source 
chore: Feature merge master
This commit is contained in:
二货机器人 2020-12-03 19:01:41 +08:00 committed by GitHub
commit 9178f871a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/label-merge.yml vendored
View File

@ -6,10 +6,10 @@ on:
jobs:
auto-merge:
runs-on: ubuntu-latest
if: github.event.pull_request.head.repo.full_name == 'ant-design/ant-design' && (github.event.pull_request.head.ref == 'master' || github.event.pull_request.head.ref == 'feature')
if: github.event.label.name == 'BranchAutoMerge' && github.event.pull_request.head.repo.full_name == 'ant-design/ant-design' && (github.event.pull_request.head.ref == 'master' || github.event.pull_request.head.ref == 'feature')
steps:
- name: Auto Approve
uses: hmarr/auto-approve-action@v2.0.0
uses: zombieJ/automerge-action@0.0.2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Auto Merge

10
components/table/style/index.less
View File

@ -373,12 +373,18 @@
}
&-selection {
display: flex;
position: relative;
display: inline-flex;
flex-direction: column;
&-extra {
margin-inline-start: @margin-xss;
position: absolute;
top: 0;
z-index: 1;
cursor: pointer;
transition: all 0.3s;
margin-inline-start: 100%;
padding-inline-start: @padding-xss;
.@{iconfont-css-prefix} {
color: @table-header-icon-color;