From e7ccdfef744a67152fce33eeb49ce13f9d883327 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 22 Sep 2017 18:13:06 +0800 Subject: [PATCH] Improve card variables --- components/card/style/index.less | 6 ++---- components/style/themes/default.less | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/card/style/index.less b/components/card/style/index.less index f662f490e1..c6a58ed4b4 100644 --- a/components/card/style/index.less +++ b/components/card/style/index.less @@ -2,8 +2,7 @@ @import "../../style/mixins/index"; @card-prefix-cls: ~"@{ant-prefix}-card"; -@card-padding-base: 24px; -@card-padding-wider: 32px; +@card-head-height: 48px; .@{card-prefix-cls} { .reset-component; @@ -31,6 +30,7 @@ border-radius: @border-radius-sm @border-radius-sm 0 0; .clearfix; margin-bottom: -1px; // Fix card grid overflow bug: https://gw.alipayobjects.com/zos/rmsportal/XonYxBikwpgbqIQBeuhk.png + min-height: @card-head-height; &-wrapper { display: flex; @@ -38,7 +38,6 @@ &-title { font-size: @font-size-lg; - min-height: @card-head-height; padding: @card-head-padding 0; text-overflow: ellipsis; overflow: hidden; @@ -195,7 +194,6 @@ background: @background-color-base; &-title { - min-height: @card-inner-head-height; padding: @card-inner-head-padding 0; } } diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 0d86f4e9f9..06e377a93c 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -331,12 +331,12 @@ // Card // --- -@card-head-height: 48px; -@card-inner-head-height: 46px; @card-head-color: @heading-color; @card-head-background: @component-background; @card-head-padding: 16px; @card-inner-head-padding: 12px; +@card-padding-base: 24px; +@card-padding-wider: 32px; @card-actions-background: @background-color-base; // Tabs