From 1cf076ffc868cdcc9f60f12710b71fc86269c45a Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Wed, 21 Sep 2022 18:03:52 +0800 Subject: [PATCH] fix: divider dashed style (#37679) --- components/divider/style/index.tsx | 3 +- components/style/themes/compact.less | 295 --------------------------- 2 files changed, 1 insertion(+), 297 deletions(-) delete mode 100644 components/style/themes/compact.less diff --git a/components/divider/style/index.tsx b/components/divider/style/index.tsx index 31257ba4ff..0bd625e3de 100644 --- a/components/divider/style/index.tsx +++ b/components/divider/style/index.tsx @@ -99,8 +99,7 @@ const genSharedDividerStyle: GenerateStyle = (token): CSSObject => background: 'none', borderColor: colorSplit, borderStyle: 'dashed', - borderWidth: 0, - borderBlockStart: `${controlLineWidth}px`, + borderWidth: `${controlLineWidth}px 0 0`, }, '&-horizontal&-with-text&-dashed': { diff --git a/components/style/themes/compact.less b/components/style/themes/compact.less deleted file mode 100644 index c650b9ec52..0000000000 --- a/components/style/themes/compact.less +++ /dev/null @@ -1,295 +0,0 @@ -@import './default.less'; - -@line-height-base: 1.66667; -@mode: compact; -@font-size-base: 12px; -@font-size-lg: @font-size-base + 2px; - -// default paddings -@default-padding-lg: 24px; // containers -@default-padding-md: 16px; // small containers and buttons -@default-padding-sm: 12px; // Form controls and items -@default-padding-xs: 8px; // small items -@default-padding-xss: 4px; // more small - -// vertical paddings -@padding-lg: 16px; // containers -@padding-md: 8px; // small containers and buttons -@padding-sm: 8px; // Form controls and items -@padding-xs: 4px; // small items -@padding-xss: 0px; // more small - -// vertical padding for all form controls -@control-padding-horizontal: @padding-sm; -@control-padding-horizontal-sm: @default-padding-xs; - -// vertical margins -@margin-lg: 16px; // containers -@margin-md: 8px; // small containers and buttons -@margin-sm: 8px; // Form controls and items -@margin-xs: 4px; // small items -@margin-xss: 0px; // more small - -// height rules -@height-base: 28px; -@height-lg: 32px; -@height-sm: 22px; - -// Button -// --- -@btn-padding-horizontal-base: @default-padding-sm - 1px; -@btn-padding-horizontal-lg: @btn-padding-horizontal-base; -@btn-padding-horizontal-sm: @default-padding-xs - 1px; -@btn-square-only-icon-size-lg: 16px; -@btn-square-only-icon-size: 14px; -@btn-square-only-icon-size-sm: 12px; - -// Breadcrumb -// --- -@breadcrumb-font-size: @font-size-base; -@breadcrumb-icon-font-size: @font-size-base; - -//Dropdown -@dropdown-line-height: 18px; - -// Menu -@menu-item-padding: 0 12px; -@menu-horizontal-line-height: 38px; -@menu-inline-toplevel-item-height: 32px; -@menu-item-height: 32px; -@menu-item-vertical-margin: 0px; -@menu-item-boundary-margin: 0px; -@menu-icon-margin-right: 8px; - -// Checkbox -@checkbox-size: 14px; -@checkbox-group-item-margin-right: 6px; - -// picker -@picker-panel-cell-height: 22px; -@picker-panel-cell-width: 32px; -@picker-text-height: 32px; -@picker-time-panel-cell-height: 24px; -@picker-panel-without-time-cell-height: 48px; - -// Form -// --- -@form-item-margin-bottom: 16px; -@form-vertical-label-padding: 0 0 4px; - -// Rate -// --- -@rate-star-size: 16px; - -// Radio -// --- -@radio-size: 14px; -@radio-wrapper-margin-right: 6px; - -// Switch -// --- -@switch-height: 20px; -@switch-sm-height: 14px; -@switch-min-width: 40px; -@switch-sm-min-width: 24px; -@switch-inner-margin-min: 4px; -@switch-inner-margin-max: 22px; - -// Slider -// --- -@slider-handle-size: 12px; -@slider-handle-margin-top: -4px; - -// Input -// --- -@input-padding-vertical-base: round( - max( - (round(((@input-height-base - @font-size-base * @line-height-base) / 2) * 10) / 10) - - @border-width-base, - 2px - ) -); -@input-padding-horizontal-lg: 11px; - -// PageHeader -// --- -@page-header-padding: 16px; -@page-header-padding-vertical: 8px; -@page-header-heading-title: 16px; -@page-header-heading-sub-title: 12px; -@page-header-tabs-tab-font-size: 14px; - -// Pagination -// --- -@pagination-mini-options-size-changer-top: 1px; -@pagination-item-size-sm: 22px; - -// Cascader -// ---- -@cascader-dropdown-line-height: @dropdown-line-height; - -// Select -// --- -@select-dropdown-height: @height-base; -@select-single-item-height-lg: 32px; -@select-multiple-item-height: @input-height-base - max(@input-padding-vertical-base, 4) * 2; // Normal 24px -@select-multiple-item-height-lg: 24px; -@select-multiple-item-spacing-half: 3px; - -// Tree -// --- -@tree-title-height: 20px; - -// Transfer -// --- -@transfer-item-padding-vertical: 3px; -@transfer-list-search-icon-top: 8px; -@transfer-header-height: 36px; - -// Comment -// --- -@comment-actions-margin-bottom: 0px; -@comment-actions-margin-top: @margin-xs; -@comment-content-detail-p-margin-bottom: 0px; - -// Steps -// --- -@steps-icon-size: 24px; -@steps-icon-custom-size: 20px; -@steps-icon-custom-font-size: 20px; -@steps-icon-custom-top: 2px; -@steps-icon-margin: 2px 8px 2px 0; -@steps-icon-font-size: @font-size-base; -@steps-dot-top: 4px; -@steps-icon-top: 0px; -@steps-small-icon-size: 20px; -@steps-vertical-icon-width: 12px; -@steps-vertical-tail-width: 12px; -@steps-vertical-tail-width-sm: 10px; -// Collapse -// --- -//@collapse-header-padding-extra: 32px; -@collapse-content-padding: @padding-md @padding-lg; - -// List -// --- -@list-item-meta-description-font-size: @font-size-sm; -@list-item-padding-sm: 4px 12px; -@list-item-padding-lg: 12px 16px; - -// Drawer -// --- -@drawer-header-padding: 11px @padding-lg; -@drawer-footer-padding-vertical: @padding-sm; -@drawer-footer-padding-horizontal: @padding-sm; -@drawer-header-close-size: 44px; - -// Modal -// -- -@modal-header-padding-vertical: 11px; -@modal-header-padding: @modal-header-padding-vertical @modal-header-padding-horizontal; -@modal-footer-padding-vertical: @padding-sm; -@modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical; -@modal-confirm-body-padding: 24px 24px 16px; - -// Message -// --- -@message-notice-content-padding: 8px 16px; - -// popover -// -- -@popover-min-height: 28px; -@popover-padding-horizontal: @default-padding-sm; - -// Card -// --- -@card-head-height: 36px; -@card-head-font-size: @card-head-font-size-sm; -@card-head-padding: 8.5px; -@card-padding-base: 12px; -@card-padding-base-sm: @card-padding-base; -@card-head-height-sm: 30px; -@card-head-padding-sm: 6px; -@card-actions-li-margin: 4px 0; -@card-head-tabs-margin-bottom: -9px; - -// Table -// --- -@table-padding-vertical: 12px; -@table-padding-horizontal: 8px; -@table-padding-vertical-md: 8px; -@table-padding-horizontal-md: 8px; -@table-padding-vertical-sm: 4px; -@table-padding-horizontal-sm: 4px; -@table-selection-column-width: 32px; - -// Statistic -// --- -@statistic-content-font-size: 20px; - -// Alert -// --- -@alert-with-description-no-icon-padding-vertical: 7px; -@alert-with-description-padding-vertical: 11px; -@alert-icon-top: 7px + @font-size-base * (@line-height-base / 2) - (@font-size-base / 2); -@alert-with-description-icon-size: 20px; - -// Skeleton -// --- -@skeleton-paragraph-margin-top: 20px; -@skeleton-paragraph-li-margin-top: 12px; -@skeleton-paragraph-li-height: 14px; -@skeleton-title-height: 14px; -@skeleton-title-paragraph-margin-top: 20px; - -// Descriptions -@descriptions-title-margin-bottom: 8px; -@descriptions-default-padding: 12px @padding-lg; -@descriptions-item-padding-bottom: @padding-xs; - -// Avatar -// --- -@avatar-size-base: 28px; -@avatar-size-lg: 32px; -@avatar-size-sm: 22px; -@avatar-font-size-base: 16px; -@avatar-font-size-lg: 20px; -@avatar-font-size-sm: 12px; - -// Badge -// --- -@badge-height: 18px; - -// Tag -// --- -@tag-line-height: 18px; - -// Notification -// --- -@notification-padding-vertical: 12px; -@notification-padding-horizontal: 16px; - -// Result -// --- -@result-title-font-size: 20px; -@result-icon-font-size: 64px; -@result-extra-margin: 24px 0 0 0; - -// Anchor -// --- -@anchor-link-top: 4px; -@anchor-link-left: 16px; -@anchor-link-padding: @anchor-link-top 0 @anchor-link-top @anchor-link-left; - -// Tabs -// --- -@tabs-card-horizontal-padding: 4px @padding-md; - -// Progress -// --- -@progress-circle-text-font-size: 0.833333em; - -// Image -// --- -@image-size-base: 48px; -@image-font-size-base: 24px;