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

chore: auto merge branches (#46436)

Browse Source 
chore: feature merge master
This commit is contained in:
github-actions[bot] 2023-12-13 13:35:31 +00:00 committed by GitHub
commit dbffde90c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/segmented/index.en-US.md
View File

@ -20,7 +20,7 @@ Segmented Controls. This component is available since `antd@4.20.0`.
<!-- prettier-ignore -->
<code src="./demo/basic.tsx">Basic</code>
<code src="./demo/block.tsx">Block Segmented</code>
<code src="./demo/disabled.tsx">Basic</code>
<code src="./demo/disabled.tsx">Disabled</code>
<code src="./demo/controlled.tsx">Controlled mode</code>
<code src="./demo/custom.tsx">Custom Render</code>
<code src="./demo/dynamic.tsx">Dynamic</code>

5
components/select/style/multiple.tsx
View File

@ -58,9 +58,8 @@ function genSizeStyle(token: SelectToken, suffix?: string): CSSObject {
alignItems: 'center',
height: '100%',
// Multiple is little different that horizontal is follow the vertical
padding: `${unit(token.calc(selectItemDist).sub(FIXED_ITEM_MARGIN).equal())} ${unit(
token.calc(FIXED_ITEM_MARGIN).mul(2).equal(),
)}`,
paddingInline: token.calc(FIXED_ITEM_MARGIN).mul(2).equal(),
paddingBlock: token.calc(selectItemDist).sub(FIXED_ITEM_MARGIN).equal(),
borderRadius: token.borderRadius,
[`${componentCls}-show-search&`]: {

5
scripts/visual-regression/report-template.html
View File

@ -1,5 +1,6 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -10,6 +11,7 @@
padding-top: 16px;
padding-bottom: 16px;
}
/* Table Styles */
table {
width: 100%;
@ -21,6 +23,7 @@
padding: 8px;
text-align: left;
border-bottom: 1px solid #ddd;
vertical-align: top;
}
th {
@ -68,7 +71,9 @@
}
</style>
</head>
<body>
{{reportContent}}
</body>
</html>