From 4c2dcc699c1b818f89f6f30a705b36add075171c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=AE=9C?= Date: Fri, 13 Nov 2015 18:04:39 +0800 Subject: [PATCH] =?UTF-8?q?iconfont=E5=BC=95=E7=94=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=81=8F=E7=A7=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style/components/alert.less | 1 + style/components/breadcrumb.less | 2 +- style/components/confirm.less | 2 +- style/components/datepicker/Calendar.less | 2 +- style/components/menu.less | 4 ++-- style/components/select.less | 4 +++- style/components/steps.less | 4 ++-- style/components/table.less | 2 +- style/components/tabs.less | 2 +- style/components/tag.less | 2 +- style/core/iconfont.less | 1 + style/mixins/button.less | 4 ++-- 12 files changed, 17 insertions(+), 13 deletions(-) diff --git a/style/components/alert.less b/style/components/alert.less index 20fc5cb83f..1cadc66585 100644 --- a/style/components/alert.less +++ b/style/components/alert.less @@ -15,6 +15,7 @@ &-icon { margin-right: 8px; font-size: 14px; + top: 2px; } &-description { diff --git a/style/components/breadcrumb.less b/style/components/breadcrumb.less index 1511f21975..4f51b88faa 100644 --- a/style/components/breadcrumb.less +++ b/style/components/breadcrumb.less @@ -24,7 +24,7 @@ .anticon { position: relative; - top: -1px; + top: 1px; } .anticon + span { diff --git a/style/components/confirm.less b/style/components/confirm.less index 4b1d1548d9..ea5b33562a 100644 --- a/style/components/confirm.less +++ b/style/components/confirm.less @@ -27,7 +27,7 @@ font-size: 24px; margin-right: 12px; position: relative; - top: 2px; + top: 5px; } .anticon-exclamation-circle { diff --git a/style/components/datepicker/Calendar.less b/style/components/datepicker/Calendar.less index 01daa1a586..5f71af62dc 100644 --- a/style/components/datepicker/Calendar.less +++ b/style/components/datepicker/Calendar.less @@ -243,7 +243,7 @@ height: 20px; text-align: center; line-height: 20px; - top: 6px; + top: 8px; margin: 0; } diff --git a/style/components/menu.less b/style/components/menu.less index 45a782c795..3f3264cd73 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -140,7 +140,7 @@ .anticon { width: 14px; margin-right: 8px; - top: -1px; + top: 1px; color: #999; } } @@ -266,6 +266,6 @@ .anticon { width: 14px; margin-right: 8px; - top: -1px; + top: 1px; } } diff --git a/style/components/select.less b/style/components/select.less index 7597f7f682..b941bcb6ad 100644 --- a/style/components/select.less +++ b/style/components/select.less @@ -275,8 +275,10 @@ &-open { .@{select-prefix-cls}-arrow { + .ie-rotate(2); + -ms-transform: rotate(180deg); &:before { - content: "\e602"; + .rotate(180deg); } } .@{select-prefix-cls}-selection { diff --git a/style/components/steps.less b/style/components/steps.less index d7f7abb9f7..d8e795fc19 100644 --- a/style/components/steps.less +++ b/style/components/steps.less @@ -134,7 +134,7 @@ &.anticon { font-size: 12px; position: relative; - top: -2px; + top: 1px; } } } @@ -197,7 +197,7 @@ margin-right: 10px; > .@{steps-prefix-cls}-icon.anticon { .iconfont-size-under-12px(9px); - top: -1px; + top: 1px; } } .@{steps-prefix-cls}-main { diff --git a/style/components/table.less b/style/components/table.less index 010ddfc81f..0dc5945293 100644 --- a/style/components/table.less +++ b/style/components/table.less @@ -28,7 +28,7 @@ .anticon-bars { margin-left: 4px; position: relative; - top: -1px; + top: 1px; .iconfont-size-under-12px(10px); cursor: pointer; color: #aaa; diff --git a/style/components/tabs.less b/style/components/tabs.less index d1134f3999..9d99a9e926 100644 --- a/style/components/tabs.less +++ b/style/components/tabs.less @@ -177,7 +177,7 @@ width: 14px; height: 14px; margin-right: 8px; - top: -1px; + top: 1px; } } diff --git a/style/components/tag.less b/style/components/tag.less index 4ad409397f..02d328d13c 100644 --- a/style/components/tag.less +++ b/style/components/tag.less @@ -33,7 +33,7 @@ font-weight: bold; margin-left: 3px; position: relative; - top: -1px; + top: 1px; color: #666; transition: all 0.3s ease; opacity: 0.66; diff --git a/style/core/iconfont.less b/style/core/iconfont.less index a0605fdd29..abe0055325 100644 --- a/style/core/iconfont.less +++ b/style/core/iconfont.less @@ -92,6 +92,7 @@ .@{iconfont-css-prefix}-desktop:before {content:"\e662";} .@{iconfont-css-prefix}-edit:before {content:"\e668";} .@{iconfont-css-prefix}-ellipsis:before {content:"\e667";} +.@{iconfont-css-prefix}-upload:before {content:"\e663";} .@{iconfont-css-prefix}-upload-line:before {content:"\e663";} .@{iconfont-css-prefix}-download-line:before {content:"\e664";} .@{iconfont-css-prefix}-delete:before {content:"\e661";} diff --git a/style/mixins/button.less b/style/mixins/button.less index 2b73334bce..af96cd66f8 100644 --- a/style/mixins/button.less +++ b/style/mixins/button.less @@ -93,7 +93,7 @@ > .@{iconfont-css-prefix} { line-height: 1; position: relative; - top: -1px; + top: 1px; } &, @@ -168,7 +168,7 @@ .button-size(0; @font-size-base + 2; 50%); > .@{iconfont-css-prefix} { - top: -1px; + top: 1px; } &.@{btnClassName}-lg {