Skip to content

Commit 18b6eb6

Browse files
authored
fix: card divider (#1377)
1 parent 2cc06ea commit 18b6eb6

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

src/Card/index.axml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</view>
4848
</ant-sticky>
4949

50-
<view a:if="{{!finalFoldStatus}}" class="ant-card-divider {{divider ? 'ant-card-divider-with-line g-hairline--top' : ''}}"></view>
50+
<view a:if="{{!finalFoldStatus}}" class="ant-card-divider {{divider ? 'ant-card-divider-with-line' : ''}}"></view>
5151

5252
<!-- 卡片内容插槽 -->
5353
<view class="ant-card-content {{ finalFoldStatus ? 'ant-card-content-collapse' : '' }}">

src/Card/index.less

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import (reference) './variable.less';
2+
@import '../style/mixins/hairline.less';
23

34
@cardPrefix: ant-card;
45

@@ -43,8 +44,9 @@
4344

4445
.ant-card-divider {
4546
margin: 0 24 * @rpx;
46-
height: 1px;
4747
&-with-line {
48+
position: relative;
49+
.hairline('top',@ant-card-divider-color);
4850
}
4951
}
5052

src/Card/variable.less

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33

44
@ant-card-bg: var(--ant-card-bg, @COLOR_WHITE);
55

6-
@ant-card-header-title-color: var(--ant-card-header-title-color, @COLOR_TEXT_PRIMARY);
6+
@ant-card-header-title-color: var(
7+
--ant-card-header-title-color,
8+
@COLOR_TEXT_PRIMARY
9+
);
710

811
@ant-card-link-color: var(--ant-card-header-title-color, @COLOR_TEXT_ASSIST);
912

1013
@ant-card-fold-btn-color: var(--ant-card-fold-btn-color, @COLOR_BRAND1);
1114

12-
15+
@ant-card-divider-color: var(--ant-card-divider-color, #eeeeee);

src/style/themes/theme-black.less

+1
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ page {
455455
--ant-card-header-title-color: #c5cad1;
456456
--ant-card-header-link-color: #616161;
457457
--ant-card-fold-btn-color: #3086ff;
458+
--ant-card-divider-color: #2b2b2b;
458459
// countdown
459460
--ant-countdown-color: #808080;
460461
--ant-countdown-number-color: #000000;

src/style/variables.less

+1
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ page {
484484
--ant-card-header-title-color: #333333;
485485
--ant-card-header-link-color: #999999;
486486
--ant-card-fold-btn-color: #1677ff;
487+
--ant-card-divider-color: #eeeeee;
487488

488489
// countDown
489490
--ant-countdown-color: #666;

0 commit comments

Comments
 (0)