diff --git a/src-next/action-sheet/index.js b/src-next/action-sheet/index.js index 06105aa22..da0cac156 100644 --- a/src-next/action-sheet/index.js +++ b/src-next/action-sheet/index.js @@ -125,7 +125,7 @@ export default createComponent({ return [ {item.name}, - item.subname && {item.subname}, + item.subname &&
{item.subname}
, ]; } diff --git a/src-next/action-sheet/index.less b/src-next/action-sheet/index.less index 4d86492d3..79ba786b9 100644 --- a/src-next/action-sheet/index.less +++ b/src-next/action-sheet/index.less @@ -9,10 +9,8 @@ &__cancel { display: block; width: 100%; - height: @action-sheet-item-height; - padding: 0; + padding: 14px @padding-md; font-size: @action-sheet-item-font-size; - line-height: 20px; background-color: @action-sheet-item-background; border: none; cursor: pointer; @@ -23,6 +21,8 @@ } &__item { + line-height: @action-sheet-item-line-height; + &--loading, &--disabled { color: @action-sheet-item-disabled-text-color; @@ -42,9 +42,10 @@ } &__subname { - margin-left: @padding-base; + margin-top: @padding-xs; color: @action-sheet-subname-color; font-size: @action-sheet-subname-font-size; + line-height: @action-sheet-subname-line-height; } &__gap { diff --git a/src-next/style/var.less b/src-next/style/var.less index 4ddc2770a..a0957a179 100644 --- a/src-next/style/var.less +++ b/src-next/style/var.less @@ -70,13 +70,14 @@ @action-sheet-description-color: @gray-6; @action-sheet-description-font-size: @font-size-md; @action-sheet-description-line-height: 20px; -@action-sheet-item-height: 50px; @action-sheet-item-background: @white; @action-sheet-item-font-size: @font-size-lg; +@action-sheet-item-line-height: 22px; @action-sheet-item-text-color: @text-color; @action-sheet-item-disabled-text-color: @gray-5; @action-sheet-subname-color: @gray-6; @action-sheet-subname-font-size: @font-size-sm; +@action-sheet-subname-line-height: 20px; @action-sheet-close-icon-size: 22px; @action-sheet-close-icon-color: @gray-5; @action-sheet-close-icon-active-color: @gray-6; @@ -343,7 +344,7 @@ @empty-bottom-margin-top: 24px; // Field -@field-label-width: 6em; +@field-label-width: 6.2em; @field-label-color: @gray-7; @field-label-margin-right: @padding-sm; @field-input-text-color: @text-color; @@ -812,12 +813,11 @@ @uploader-icon-color: @gray-4; @uploader-text-color: @gray-6; @uploader-text-font-size: @font-size-sm; -@uploader-upload-border-radius: 8px; @uploader-upload-background-color: @gray-1; @uploader-upload-active-color: @active-color; -@uploader-delete-color: @gray-6; -@uploader-delete-icon-size: 18px; -@uploader-delete-background-color: @white; +@uploader-delete-color: @white; +@uploader-delete-icon-size: 14px; +@uploader-delete-background-color: rgba(0, 0, 0, 0.7); @uploader-file-background-color: @background-color; @uploader-file-icon-size: 20px; @uploader-file-icon-color: @gray-7;