Skip to content

Commit 76585f7

Browse files
committed
style: popover & progress
1 parent 3656dd5 commit 76585f7

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

components/popover/style/index.less

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
background-color: @popover-bg;
138138
content: '';
139139
pointer-events: auto;
140+
.roundedArrow(@popover-arrow-width, 5px, @popover-bg);
140141
}
141142
}
142143

@@ -170,8 +171,8 @@
170171
left: @popover-distance - @popover-arrow-rotate-width;
171172

172173
&-content {
173-
box-shadow: -3px 3px 7px fade(@black, 7%);
174-
transform: translateX((@popover-arrow-rotate-width / 2)) rotate(45deg);
174+
box-shadow: 3px 3px 7px fade(@black, 7%);
175+
transform: translateX((@popover-arrow-rotate-width / 2)) rotate(135deg);
175176
}
176177
}
177178

@@ -194,8 +195,8 @@
194195
top: @popover-distance - @popover-arrow-rotate-width;
195196

196197
&-content {
197-
box-shadow: -2px -2px 5px fade(@black, 6%);
198-
transform: translateY((@popover-arrow-rotate-width / 2)) rotate(45deg);
198+
box-shadow: 2px 2px 5px fade(@black, 6%);
199+
transform: translateY((@popover-arrow-rotate-width / 2)) rotate(-135deg);
199200
}
200201
}
201202

@@ -218,8 +219,8 @@
218219
right: @popover-distance - @popover-arrow-rotate-width;
219220

220221
&-content {
221-
box-shadow: 3px -3px 7px fade(@black, 7%);
222-
transform: translateX((-@popover-arrow-rotate-width / 2)) rotate(45deg);
222+
box-shadow: 3px 3px 7px fade(@black, 7%);
223+
transform: translateX((-@popover-arrow-rotate-width / 2)) rotate(-45deg);
223224
}
224225
}
225226

components/progress/Line.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default defineComponent({
9393
return {
9494
width: `${validProgress(percent)}%`,
9595
height: `${strokeWidth || (size === 'small' ? 6 : 8)}px`,
96-
borderRadius: strokeLinecap === 'square' ? 0 : '',
96+
borderRadius: strokeLinecap === 'square' ? 0 : undefined,
9797
...(backgroundProps.value as any),
9898
};
9999
});
@@ -106,7 +106,7 @@ export default defineComponent({
106106
return {
107107
width: `${validProgress(successPercent.value)}%`,
108108
height: `${strokeWidth || (size === 'small' ? 6 : 8)}px`,
109-
borderRadius: strokeLinecap === 'square' ? 0 : '',
109+
borderRadius: strokeLinecap === 'square' ? 0 : undefined,
110110
backgroundColor: success?.strokeColor,
111111
};
112112
});

components/progress/index.en-US.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Properties that shared by all types.
2323
| format | The template function of the content | function(percent, successPercent) | (percent) => percent + `%` | |
2424
| percent | To set the completion percentage | number | 0 | |
2525
| showInfo | Whether to display the progress value and the status icon | boolean | true | |
26+
| size | To set the size of the progress | `default` \| `small` | `default` |
2627
| status | To set the status of the Progress, options: `success` `exception` `normal` `active`(line only) | string | - | |
2728
| strokeColor | The color of progress bar | string | - | |
2829
| strokeLinecap | To set the style of the progress linecap | `round` \| `square` | `round` | |

components/progress/index.zh-CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/xqsDu4ZyR/Progress.svg
2424
| format | 内容的模板函数 | function(percent, successPercent) | (percent) => percent + `%` | |
2525
| percent | 百分比 | number | 0 | |
2626
| showInfo | 是否显示进度数值或状态图标 | boolean | true | |
27+
| size | 进度条大小 | `default` \| `small` | `default` |
2728
| status | 状态,可选:`success` `exception` `normal` `active`(仅限 line) | string | - | |
2829
| strokeColor | 进度条的色彩 | string | - | |
2930
| strokeLinecap | 进度条的样式 | `round` \| `square` | `round` | |

0 commit comments

Comments
 (0)