From 3cbb5da6c2334a930b80ddd37f7ece3990167ab0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 3 Sep 2018 17:11:20 +0800 Subject: [PATCH] tweak icons size --- components/alert/style/index.less | 7 ++++--- components/modal/style/confirm.less | 6 +++--- components/notification/style/index.less | 2 +- components/pagination/style/index.less | 11 +++-------- components/popover/style/index.less | 1 + components/rate/style/index.less | 3 +++ components/style/themes/default.less | 2 +- components/switch/index.tsx | 2 +- components/tabs/style/index.less | 1 + 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/components/alert/style/index.less b/components/alert/style/index.less index 3f50dc5ab6..e13fe3c5d0 100644 --- a/components/alert/style/index.less +++ b/components/alert/style/index.less @@ -18,9 +18,10 @@ } &-icon { - top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2 + 1px; + top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2 - 0.5px; left: 16px; position: absolute; + font-size: @font-size-base + 2px; } &-description { @@ -98,9 +99,9 @@ &-with-description &-icon { position: absolute; - top: 16px; + top: 14px; left: 24px; - font-size: 24px; + font-size: 26px; } &-with-description &-close-icon { diff --git a/components/modal/style/confirm.less b/components/modal/style/confirm.less index bec6f8f0e7..986d9a1053 100644 --- a/components/modal/style/confirm.less +++ b/components/modal/style/confirm.less @@ -1,6 +1,7 @@ @import "../../style/mixins/index"; @confirm-prefix-cls: ~"@{ant-prefix}-confirm"; +@confirm-icon-size: 26px; .@{confirm-prefix-cls} { .@{ant-prefix}-modal-header { @@ -24,7 +25,6 @@ color: @heading-color; font-weight: 500; font-size: @font-size-lg; - line-height: 1.4; display: block; // create BFC to avoid // https://user-images.githubusercontent.com/507615/37702510-ba844e06-2d2d-11e8-9b67-8e19be57f445.png @@ -32,14 +32,14 @@ } .@{confirm-prefix-cls}-content { - margin-left: 38px; + margin-left: @confirm-icon-size + 16px; font-size: @font-size-base; color: @text-color; margin-top: 8px; } > .@{iconfont-css-prefix} { - font-size: 22px; + font-size: @confirm-icon-size; margin-right: 16px; float: left; } diff --git a/components/notification/style/index.less b/components/notification/style/index.less index 9166823193..435c6cce83 100644 --- a/components/notification/style/index.less +++ b/components/notification/style/index.less @@ -86,7 +86,7 @@ &-icon { position: absolute; - font-size: 24px; + font-size: 26px; line-height: 24px; margin-left: 4px; diff --git a/components/pagination/style/index.less b/components/pagination/style/index.less index a53554d9f4..1f686379c6 100644 --- a/components/pagination/style/index.less +++ b/components/pagination/style/index.less @@ -175,14 +175,9 @@ outline: none; display: block; transition: all .3s; - - &:after { - font-size: 12px; - display: block; - height: @pagination-item-size - 2px; - text-align: center; - font-weight: 500; - } + font-size: 12px; + height: 100%; + text-align: center; } &:focus .@{pagination-prefix-cls}-item-link, diff --git a/components/popover/style/index.less b/components/popover/style/index.less index 9f86356c47..4328f958db 100644 --- a/components/popover/style/index.less +++ b/components/popover/style/index.less @@ -80,6 +80,7 @@ color: @warning-color; line-height: @line-height-base + 0.1; position: absolute; + font-size: @font-size-base + 2px; } &-title { padding-left: @font-size-base + 8px; diff --git a/components/rate/style/index.less b/components/rate/style/index.less index 61c81c04e7..111bc6dd8a 100644 --- a/components/rate/style/index.less +++ b/components/rate/style/index.less @@ -40,6 +40,9 @@ user-select: none; transition: all .3s; color: @rate-star-bg; + .@{iconfont-css-prefix} { + vertical-align: middle; + } } &:hover, diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 2100ba5b46..bd9a1efa5f 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -449,7 +449,7 @@ @breadcrumb-base-color: @text-color-secondary; @breadcrumb-last-item-color: @text-color; @breadcrumb-font-size: @font-size-base; -@breadcrumb-icon-font-size: @font-size-sm; +@breadcrumb-icon-font-size: @font-size-base; @breadcrumb-link-color: @text-color-secondary; @breadcrumb-link-color-hover: @primary-5; @breadcrumb-separator-color: @text-color-secondary; diff --git a/components/switch/index.tsx b/components/switch/index.tsx index fed1da7ad5..6796c53525 100755 --- a/components/switch/index.tsx +++ b/components/switch/index.tsx @@ -54,7 +54,7 @@ export default class Switch extends React.Component { }); const loadingIcon = loading ? ( ) : null; diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less index 25b4b81394..eb6949a113 100644 --- a/components/tabs/style/index.less +++ b/components/tabs/style/index.less @@ -189,6 +189,7 @@ .@{iconfont-css-prefix} { margin-right: 8px; + font-size: @font-size-base + 2px; } }