diff --git a/components/alert/style/index.less b/components/alert/style/index.less index e13fe3c5d0..66eb8957f2 100644 --- a/components/alert/style/index.less +++ b/components/alert/style/index.less @@ -18,10 +18,9 @@ } &-icon { - top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2 - 0.5px; + top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2; left: 16px; position: absolute; - font-size: @font-size-base + 2px; } &-description { @@ -99,9 +98,9 @@ &-with-description &-icon { position: absolute; - top: 14px; + top: 16px; left: 24px; - font-size: 26px; + font-size: 24px; } &-with-description &-close-icon { diff --git a/components/icon/index.tsx b/components/icon/index.tsx index c4fdede227..b57061dffe 100755 --- a/components/icon/index.tsx +++ b/components/icon/index.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import classNames from 'classnames'; -import * as allIcons from '@ant-design/icons'; +import * as allIcons from '@ant-design/icons/lib/dist'; import ReactIcon from '@ant-design/icons-react'; import createFromIconfontCN from './IconFont'; import { diff --git a/components/modal/style/confirm.less b/components/modal/style/confirm.less index 986d9a1053..bec6f8f0e7 100644 --- a/components/modal/style/confirm.less +++ b/components/modal/style/confirm.less @@ -1,7 +1,6 @@ @import "../../style/mixins/index"; @confirm-prefix-cls: ~"@{ant-prefix}-confirm"; -@confirm-icon-size: 26px; .@{confirm-prefix-cls} { .@{ant-prefix}-modal-header { @@ -25,6 +24,7 @@ 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: @confirm-icon-size + 16px; + margin-left: 38px; font-size: @font-size-base; color: @text-color; margin-top: 8px; } > .@{iconfont-css-prefix} { - font-size: @confirm-icon-size; + font-size: 22px; margin-right: 16px; float: left; } diff --git a/components/notification/style/index.less b/components/notification/style/index.less index 435c6cce83..9166823193 100644 --- a/components/notification/style/index.less +++ b/components/notification/style/index.less @@ -86,7 +86,7 @@ &-icon { position: absolute; - font-size: 26px; + font-size: 24px; line-height: 24px; margin-left: 4px; diff --git a/components/style/themes/default.less b/components/style/themes/default.less index bd9a1efa5f..2100ba5b46 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-base; +@breadcrumb-icon-font-size: @font-size-sm; @breadcrumb-link-color: @text-color-secondary; @breadcrumb-link-color-hover: @primary-5; @breadcrumb-separator-color: @text-color-secondary; diff --git a/components/switch/style/index.less b/components/switch/style/index.less index 7579226182..6fb4feb796 100644 --- a/components/switch/style/index.less +++ b/components/switch/style/index.less @@ -52,7 +52,8 @@ } &-loading-icon { - animation: loadingCircle 1s infinite linear; + // loading default use animation + // animation: loadingCircle 1s infinite linear; background: transparent; z-index: 1; display: none; @@ -125,7 +126,8 @@ } &-small&-loading &-loading-icon { - animation: AntSwitchSmallLoadingCircle 1s infinite linear; + // animation: AntSwitchSmallLoadingCircle 1s infinite linear; + transform: scale(0.66667); font-weight: bold; } diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less index eb6949a113..25b4b81394 100644 --- a/components/tabs/style/index.less +++ b/components/tabs/style/index.less @@ -189,7 +189,6 @@ .@{iconfont-css-prefix} { margin-right: 8px; - font-size: @font-size-base + 2px; } } diff --git a/package.json b/package.json index 38789548f5..e317903da4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "react-dom": ">=16.0.0" }, "dependencies": { - "@ant-design/icons": "~1.1.3", + "@ant-design/icons": "~1.1.4", "@ant-design/icons-react": "~1.1.1", "array-tree-filter": "^2.0.0", "babel-runtime": "6.x",