Skip to content

Commit

Permalink
fix: change description color
Browse files Browse the repository at this point in the history
  • Loading branch information
changlin2569 committed Feb 19, 2024
1 parent 1f95e79 commit 0a8fe86
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion compiled/alipay/src/Radio/index.axml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</view>
</label>
<view
a:if="{{ typeof description === 'string' }}"
a:if="{{ description }}"
class="ant-radio-item-desc {{ disabled ? 'ant-radio-item-disabled' : '' }}">
{{ description }}
</view>
3 changes: 1 addition & 2 deletions compiled/alipay/src/Radio/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@
}
&-desc {
margin-left: @radio-size + 10 * @rpx;
opacity: @radio-item-description;
color: @COLOR_TEXT_PRIMARY;
color: @COLOR_TEXT_ASSIST;
font-size: @font-size-subcontent;
}
&-disabled {
Expand Down
5 changes: 1 addition & 4 deletions compiled/alipay/src/Radio/variable.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@
@radio-background-color: @COLOR_BRAND1;

/* color | disabled状态背景色 */
@radio-disabled-background: @COLOR_GREY_CARD;

/* radio 选项描述透明度 */
@radio-item-description: 0.6;
@radio-disabled-background: @COLOR_GREY_CARD;
2 changes: 1 addition & 1 deletion compiled/wechat/src/Radio/index.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</view>
</label>
<view
wx:if="{{ typeof description === 'string' }}"
wx:if="{{ description }}"
class="ant-radio-item-desc {{ disabled ? 'ant-radio-item-disabled' : '' }}">
{{ description }}
</view>
3 changes: 1 addition & 2 deletions compiled/wechat/src/Radio/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@
}
.ant-radio-item-desc {
margin-left: 27px;
opacity: 0.6;
color: #333333;
color: #999999;
font-size: 12px;
}
.ant-radio-item-disabled {
Expand Down
1 change: 0 additions & 1 deletion compiled/wechat/src/Radio/variable.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
/* color | 边框颜色 */
/* color | check状态背景色 */
/* color | disabled状态背景色 */
/* radio 选项描述透明度 */
2 changes: 1 addition & 1 deletion src/Radio/index.axml.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default (
</View>
</View>
</Label>
{typeof description === 'string' && (
{description && (
<View
class={`ant-radio-item-desc ${
disabled ? 'ant-radio-item-disabled' : ''
Expand Down
3 changes: 1 addition & 2 deletions src/Radio/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@
}
&-desc {
margin-left: @radio-size + 10 * @rpx;
opacity: @radio-item-description;
color: @COLOR_TEXT_PRIMARY;
color: @COLOR_TEXT_ASSIST;
font-size: @font-size-subcontent;
}
&-disabled {
Expand Down
5 changes: 1 addition & 4 deletions src/Radio/variable.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@
@radio-background-color: @COLOR_BRAND1;

/* color | disabled状态背景色 */
@radio-disabled-background: @COLOR_GREY_CARD;

/* radio 选项描述透明度 */
@radio-item-description: 0.6;
@radio-disabled-background: @COLOR_GREY_CARD;

0 comments on commit 0a8fe86

Please sign in to comment.