From 68b9e6125bb145bf274e85f28c918c915266bdcc Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 9 Jul 2015 18:17:15 +0800 Subject: [PATCH] update iconfont --- components/iconfont/index.md | 10 +++++++++- components/progress/index.jsx | 2 +- style/components/breadcrumb.less | 1 - style/components/button.less | 1 - style/components/datepicker/Picker.less | 13 ++++++++----- style/components/dialog/Dialog.less | 5 ++++- style/components/popover.less | 2 +- style/components/progress.less | 2 +- style/components/select.less | 12 ++++++++++-- style/components/steps.less | 15 +++++++++++---- style/components/tabs.less | 1 + style/core/iconfont.less | 6 ++++-- style/themes/default/custom.less | 2 +- 13 files changed, 51 insertions(+), 21 deletions(-) diff --git a/components/iconfont/index.md b/components/iconfont/index.md index 159653f170..f28da14150 100644 --- a/components/iconfont/index.md +++ b/components/iconfont/index.md @@ -11,7 +11,7 @@ ## 图标的命名规范 -我们为每个图标赋予了语义化的命名。我们的命名规范如下： +我们为每个图标赋予了语义化的命名。我们的命名规范如： - 1. 使用 `-` 来连接单词； @@ -498,6 +498,14 @@ windows +
  • + + ie +
    • +
  • + + chrome +
  • loading diff --git a/components/progress/index.jsx b/components/progress/index.jsx index fbd730b020..49d57395af 100644 --- a/components/progress/index.jsx +++ b/components/progress/index.jsx @@ -32,7 +32,7 @@ var Line = React.createClass({ }; var fontSize = (props.width / 100 * props.strokeWidth); var iconStyle = { - 'fontSize': (fontSize < 14) ? 14 : fontSize + 'fontSize': (fontSize < 12) ? 12 : fontSize }; var textStyle = { 'color': statusColorMap[props.status] diff --git a/style/components/breadcrumb.less b/style/components/breadcrumb.less index 5715702c52..b7ec5f4783 100644 --- a/style/components/breadcrumb.less +++ b/style/components/breadcrumb.less @@ -23,7 +23,6 @@ } .anticon { - font-size: 14px; position: relative; top: -1px; } diff --git a/style/components/button.less b/style/components/button.less index ae08b8fcfc..2b61699820 100644 --- a/style/components/button.less +++ b/style/components/button.less @@ -44,7 +44,6 @@ &-menu { > .@{iconfont-css-prefix} { - top: -1px; font-size: @font-size-base; font-size: ~"10px \9"; // ie8-9 .scale(0.83); diff --git a/style/components/datepicker/Picker.less b/style/components/datepicker/Picker.less index b150132b13..d4943920db 100644 --- a/style/components/datepicker/Picker.less +++ b/style/components/datepicker/Picker.less @@ -16,18 +16,21 @@ -webkit-user-select: none; user-select: none; .transition(all .3s @ease-in-out); - width: 14px; - height: 14px; - line-height: 14px; + width: 12px; + height: 12px; + line-height: 12px; right: 8px; color: #999; top: 50%; - margin-top: -7px; + margin-top: -6px; &:after { content: "\e60c"; font-family: "anticon"; - font-size: 14px; + font-size: 12px; color: #999; + display: inline-block; + line-height: 1; + vertical-align: bottom; } } &-open .@{prefixCalendarClass}, diff --git a/style/components/dialog/Dialog.less b/style/components/dialog/Dialog.less index 238cf95470..e019428b53 100644 --- a/style/components/dialog/Dialog.less +++ b/style/components/dialog/Dialog.less @@ -43,6 +43,7 @@ filter: alpha(opacity=20); opacity: .2; text-decoration: none; + transition: opacity .3s ease; &-x { position: absolute; @@ -58,7 +59,9 @@ -moz-osx-font-smoothing: grayscale; width: 12px; height: 12px; - font-size: 12px; + font-size: @font-size-base; + font-size: ~"10px \9"; // ie8-9 + .scale(0.83); line-height: 12px; color:#000; top:18px; diff --git a/style/components/popover.less b/style/components/popover.less index 30c4ed74b4..669f942973 100644 --- a/style/components/popover.less +++ b/style/components/popover.less @@ -127,10 +127,10 @@ padding: 8px 8px 12px 8px; font-size: 14px; .anticon { - font-size: 16px; margin-right: 6px; line-height: 18px; color: #FC8C6E; + vertical-align: text-bottom; } } diff --git a/style/components/progress.less b/style/components/progress.less index 705110234c..d87c9084da 100644 --- a/style/components/progress.less +++ b/style/components/progress.less @@ -24,7 +24,7 @@ line-height: 1; .anticon { - font-size: 1.2em; + font-size: 12px; } } diff --git a/style/components/select.less b/style/components/select.less index 7661a41ce1..07793bc4e2 100644 --- a/style/components/select.less +++ b/style/components/select.less @@ -35,8 +35,10 @@ top: 1px; right: 1px; width: 20px; - font-family: 'anticon'; + font-size: @font-size-base; + font-size: ~"10px \9"; // ie8-9 + .scale(0.83); &:before { content: '\e611'; .rotate(90deg); @@ -137,7 +139,13 @@ cursor: pointer; display: inline-block; font-weight: bold; - padding: 0 0 0 8px; + font-size: @font-size-base; + font-size: ~"8px \9"; // ie8-9 + .scale(0.67); + padding: 0 0 0 4px; + position: relative; + top: -1px; + left: 4px; &:hover { color: #333; } diff --git a/style/components/steps.less b/style/components/steps.less index 72922505fe..6b6e7d7638 100644 --- a/style/components/steps.less +++ b/style/components/steps.less @@ -14,7 +14,6 @@ @finish-description-color: @finish-title-color; @finish-tail-color: @process-icon-color; - .transition(@transition) { transition: @transition; -webkit-transition: @transition; @@ -90,11 +89,11 @@ .@{stepsPrefixClass}-head-inner { background: none; border: 0; - font-size: 20px; width: auto; height: auto; > .@{stepsPrefixClass}-icon { - top: -4px; + font-size: 20px; + top: 0; } } &.@{stepsPrefixClass}-status-process { @@ -103,7 +102,6 @@ } } } - } .@{stepsPrefixClass}-head, .@{stepsPrefixClass}-main { @@ -135,6 +133,10 @@ top: -2px; color: @primary-color; position: relative; + + &.anticon { + font-size: 12px; + } } } .@{stepsPrefixClass}-main { @@ -183,6 +185,11 @@ border-radius: 18px; font-size: 12px; margin-right: 10px; + > .@{stepsPrefixClass}-icon.anticon { + font-size: 12px; + font-size: ~"9px \9"; // ie8-9 + .scale(0.75); + } } .@{stepsPrefixClass}-main { margin-top: 0; diff --git a/style/components/tabs.less b/style/components/tabs.less index 6afc4bdc30..f77130c394 100644 --- a/style/components/tabs.less +++ b/style/components/tabs.less @@ -68,6 +68,7 @@ text-align: center; text-transform: none; font-family: sans-serif; + font-size: 12px; &:before { display: block; diff --git a/style/core/iconfont.less b/style/core/iconfont.less index e7c882d7a8..7b53810aed 100644 --- a/style/core/iconfont.less +++ b/style/core/iconfont.less @@ -125,7 +125,7 @@ .@{iconfont-css-prefix}-link:before {content:"\e640";} .@{iconfont-css-prefix}-logout:before {content:"\e642";} .@{iconfont-css-prefix}-mail:before {content:"\e643";} -.@{iconfont-css-prefix}-menu-fold:before {content:"\e644";} +.@{iconfont-css-prefix}-menu-fold:before {content:"\e645";.rotate(180deg);} .@{iconfont-css-prefix}-menu-unfold:before {content:"\e645";} .@{iconfont-css-prefix}-mobile:before {content:"\e649";} .@{iconfont-css-prefix}-notification:before {content:"\e64a";} @@ -142,12 +142,14 @@ .@{iconfont-css-prefix}-tablet:before {content:"\e664";} .@{iconfont-css-prefix}-tag:before {content:"\e665";} .@{iconfont-css-prefix}-tags:before {content:"\e666";} -.@{iconfont-css-prefix}-to-top:before {content:"\e667";} +.@{iconfont-css-prefix}-to-top:before {content:"\e667";} .@{iconfont-css-prefix}-unlock:before {content:"\e668";} .@{iconfont-css-prefix}-upload:before {content:"\e669";} .@{iconfont-css-prefix}-user:before {content:"\e66a";} .@{iconfont-css-prefix}-video-camera:before {content:"\e66b";} .@{iconfont-css-prefix}-windows:before {content:"\e66c";} +.@{iconfont-css-prefix}-ie:before {content:"\e66d";} +.@{iconfont-css-prefix}-chrome:before {content:"\e66e";} .@{iconfont-css-prefix}-loading:before { display: inline-block; .animation(loadingCircle 1s infinite linear); diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less index 1401bb562e..45ece0480e 100644 --- a/style/themes/default/custom.less +++ b/style/themes/default/custom.less @@ -20,7 +20,7 @@ // ICONFONT @iconfont-css-prefix : anticon; -@icon-url : "//at.alicdn.com/t/font_1434092639_4910953"; +@icon-url : "//at.alicdn.com/t/font_1436434300_7173727"; // LINK @link-color : @primary-color;