Skip to content

[pull] master from ant-design:master #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Oct 10, 2025
Merged

[pull] master from ant-design:master #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecc135f
fix: change margin to padding (#11558)
kinglinglive Oct 10, 2025
880e470
test: upgrade snapshot
afc163 Oct 10, 2025
49942cb
chore(deps-dev): bump @commitlint/config-conventional (#11564)
dependabot[bot] Oct 10, 2025
3502987
Add contribution leaderboard to README
afc163 Oct 10, 2025
3123a53
chore(deps-dev): bump @commitlint/cli from 19.8.1 to 20.1.0 (#11566)
dependabot[bot] Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,7 @@ Any type of contribution is welcome, here are some examples of how you may contr
- Use Ant Design Pro in your daily work.
- Submit [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions.
- Propose [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code.

<a href="https://openomy.app/github/ant-design/ant-design-pro" target="_blank" style="display: block; width: 100%;" align="center">
<img src="https://openomy.app/svg?repo=ant-design/ant-design-pro&chart=bubble&latestMonth=3" target="_blank" alt="Contribution Leaderboard" style="display: block; width: 100%;" />
</a>
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
},
"devDependencies": {
"@ant-design/pro-cli": "^3.3.0",
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@commitlint/cli": "^20.1.0",
"@commitlint/config-conventional": "^20.0.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.3.0",
"@types/express": "^5.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Skeleton } from 'antd';

const Loading: React.FC = () => (
<Skeleton style={{ margin: '24px 40px', height: '60vh' }} active />
<Skeleton style={{ padding: '24px 40px', height: '60vh' }} active />
);

export default Loading;
56 changes: 28 additions & 28 deletions src/pages/user/login/__snapshots__/login.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Login Page should login success 1`] = `
<DocumentFragment>
<div
class="ant-app css-var-«r7»"
class="ant-app css-var-_r_7_"
>
<div
class="acss-trkbkn"
Expand Down Expand Up @@ -77,14 +77,14 @@ exports[`Login Page should login success 1`] = `
>
<form
autocomplete="off"
class="ant-form ant-form-vertical css-var-«r7» ant-form-css-var ant-pro-form"
class="ant-form ant-form-vertical css-var-_r_7_ ant-form-css-var ant-pro-form"
>
<input
style="display: none;"
type="text"
/>
<div
class="ant-tabs ant-tabs-top ant-tabs-centered css-var-«r7» ant-tabs-css-var"
class="ant-tabs ant-tabs-top ant-tabs-centered css-var-_r_7_ ant-tabs-css-var"
>
<div
aria-orientation="horizontal"
Expand Down Expand Up @@ -186,13 +186,13 @@ exports[`Login Page should login success 1`] = `
</div>
</div>
<div
class="ant-form-item css-var-«r7» ant-form-css-var ant-form-item-has-success ant-form-item-vertical"
class="ant-form-item css-var-_r_7_ ant-form-css-var ant-form-item-has-success ant-form-item-vertical"
>
<div
class="ant-row ant-form-item-row css-var-«r7»"
class="ant-row ant-form-item-row css-var-_r_7_"
>
<div
class="ant-col ant-form-item-control css-var-«r7»"
class="ant-col ant-form-item-control css-var-_r_7_"
>
<div
class="ant-form-item-control-input"
Expand All @@ -201,7 +201,7 @@ exports[`Login Page should login success 1`] = `
class="ant-form-item-control-input-content"
>
<span
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-status-success css-var-«r7» ant-input-css-var"
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-status-success css-var-_r_7_ ant-input-css-var"
>
<span
class="ant-input-prefix"
Expand Down Expand Up @@ -270,13 +270,13 @@ exports[`Login Page should login success 1`] = `
</div>
</div>
<div
class="ant-form-item css-var-«r7» ant-form-css-var ant-form-item-has-success ant-form-item-vertical"
class="ant-form-item css-var-_r_7_ ant-form-css-var ant-form-item-has-success ant-form-item-vertical"
>
<div
class="ant-row ant-form-item-row css-var-«r7»"
class="ant-row ant-form-item-row css-var-_r_7_"
>
<div
class="ant-col ant-form-item-control css-var-«r7»"
class="ant-col ant-form-item-control css-var-_r_7_"
>
<div
class="ant-form-item-control-input"
Expand All @@ -285,7 +285,7 @@ exports[`Login Page should login success 1`] = `
class="ant-form-item-control-input-content"
>
<span
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-status-success ant-input-password ant-input-password-large css-var-«r7» ant-input-css-var"
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-status-success ant-input-password ant-input-password-large css-var-_r_7_ ant-input-css-var"
>
<span
class="ant-input-prefix"
Expand Down Expand Up @@ -354,7 +354,7 @@ exports[`Login Page should login success 1`] = `
style="margin-bottom: 24px;"
>
<label
class="ant-checkbox-wrapper ant-checkbox-wrapper-checked css-var-«r7» ant-checkbox-css-var"
class="ant-checkbox-wrapper ant-checkbox-wrapper-checked css-var-_r_7_ ant-checkbox-css-var"
>
<span
class="ant-checkbox ant-wave-target ant-checkbox-checked"
Expand Down Expand Up @@ -382,7 +382,7 @@ exports[`Login Page should login success 1`] = `
</a>
</div>
<button
class="ant-btn css-var-«r7» ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-lg"
class="ant-btn css-var-_r_7_ ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-lg"
style="width: 100%;"
type="button"
>
Expand Down Expand Up @@ -458,7 +458,7 @@ exports[`Login Page should login success 1`] = `
</div>
</div>
<footer
class="ant-layout-footer css-var-«r7»"
class="ant-layout-footer css-var-_r_7_"
style="padding: 0px; background: none;"
>
<div
Expand Down Expand Up @@ -547,7 +547,7 @@ exports[`Login Page should login success 1`] = `
exports[`Login Page should show login form 1`] = `
<DocumentFragment>
<div
class="ant-app css-var-«r0»"
class="ant-app css-var-_r_0_"
>
<div
class="acss-trkbkn"
Expand Down Expand Up @@ -621,14 +621,14 @@ exports[`Login Page should show login form 1`] = `
>
<form
autocomplete="off"
class="ant-form ant-form-vertical css-var-«r0» ant-form-css-var ant-pro-form"
class="ant-form ant-form-vertical css-var-_r_0_ ant-form-css-var ant-pro-form"
>
<input
style="display: none;"
type="text"
/>
<div
class="ant-tabs ant-tabs-top ant-tabs-centered css-var-«r0» ant-tabs-css-var"
class="ant-tabs ant-tabs-top ant-tabs-centered css-var-_r_0_ ant-tabs-css-var"
>
<div
aria-orientation="horizontal"
Expand Down Expand Up @@ -730,13 +730,13 @@ exports[`Login Page should show login form 1`] = `
</div>
</div>
<div
class="ant-form-item css-var-«r0» ant-form-css-var ant-form-item-vertical"
class="ant-form-item css-var-_r_0_ ant-form-css-var ant-form-item-vertical"
>
<div
class="ant-row ant-form-item-row css-var-«r0»"
class="ant-row ant-form-item-row css-var-_r_0_"
>
<div
class="ant-col ant-form-item-control css-var-«r0»"
class="ant-col ant-form-item-control css-var-_r_0_"
>
<div
class="ant-form-item-control-input"
Expand All @@ -745,7 +745,7 @@ exports[`Login Page should show login form 1`] = `
class="ant-form-item-control-input-content"
>
<span
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined css-var-«r0» ant-input-css-var"
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined css-var-_r_0_ ant-input-css-var"
>
<span
class="ant-input-prefix"
Expand Down Expand Up @@ -814,13 +814,13 @@ exports[`Login Page should show login form 1`] = `
</div>
</div>
<div
class="ant-form-item css-var-«r0» ant-form-css-var ant-form-item-vertical"
class="ant-form-item css-var-_r_0_ ant-form-css-var ant-form-item-vertical"
>
<div
class="ant-row ant-form-item-row css-var-«r0»"
class="ant-row ant-form-item-row css-var-_r_0_"
>
<div
class="ant-col ant-form-item-control css-var-«r0»"
class="ant-col ant-form-item-control css-var-_r_0_"
>
<div
class="ant-form-item-control-input"
Expand All @@ -829,7 +829,7 @@ exports[`Login Page should show login form 1`] = `
class="ant-form-item-control-input-content"
>
<span
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-password ant-input-password-large css-var-«r0» ant-input-css-var"
class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-outlined ant-input-password ant-input-password-large css-var-_r_0_ ant-input-css-var"
>
<span
class="ant-input-prefix"
Expand Down Expand Up @@ -897,7 +897,7 @@ exports[`Login Page should show login form 1`] = `
style="margin-bottom: 24px;"
>
<label
class="ant-checkbox-wrapper ant-checkbox-wrapper-checked css-var-«r0» ant-checkbox-css-var"
class="ant-checkbox-wrapper ant-checkbox-wrapper-checked css-var-_r_0_ ant-checkbox-css-var"
>
<span
class="ant-checkbox ant-wave-target ant-checkbox-checked"
Expand Down Expand Up @@ -925,7 +925,7 @@ exports[`Login Page should show login form 1`] = `
</a>
</div>
<button
class="ant-btn css-var-«r0» ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-lg"
class="ant-btn css-var-_r_0_ ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-lg"
style="width: 100%;"
type="button"
>
Expand Down Expand Up @@ -1001,7 +1001,7 @@ exports[`Login Page should show login form 1`] = `
</div>
</div>
<footer
class="ant-layout-footer css-var-«r0»"
class="ant-layout-footer css-var-_r_0_"
style="padding: 0px; background: none;"
>
<div
Expand Down
Loading