diff --git a/components/iconfont/index.md b/components/iconfont/index.md
index 290b8bc6a9..ccb40fe0c7 100644
--- a/components/iconfont/index.md
+++ b/components/iconfont/index.md
@@ -153,9 +153,12 @@ const IconSet = React.createClass({
}
});
-const icons1 = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrow-salt', 'down', 'up', 'left', 'right', 'caret-down', 'caret-up', 'caret-left', 'caret-right', 'caret-circle-right', 'caret-circle-left', 'caret-circle-o-right', 'caret-circle-o-left', 'circle-right', 'circle-left', 'circle-o-right', 'circle-o-left', 'double-right', 'double-left', 'verticle-right', 'verticle-left', 'forward', 'backward', 'rollback', 'retweet'];
+const icons1 = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrow-salt', 'down', 'up', 'left', 'right', 'caret-down', 'caret-up', 'caret-left', 'caret-right', 'caret-circle-right', 'caret-circle-left', 'caret-circle-o-right', 'caret-circle-o-left', 'circle-right', 'circle-left', 'circle-o-right', 'circle-o-left', 'double-right', 'double-left', 'verticle-right', 'verticle-left', 'forward', 'backward', 'rollback', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-right', 'arrow-up', 'arrow-down', 'arrow-left', 'play-circle', 'play-circle-o', 'circle-up', 'circle-down', 'circle-o-up', 'circle-o-down', 'caret-circle-o-down', 'caret-circle-up', 'caret-circle-down', 'iconfont-caretcircle-o-up'];
+
const icons2 = ['question', 'question-circle-o', 'question-circle', 'plus', 'plus-circle-o', 'plus-circle', 'pause', 'pause-circle-o', 'pause-circle', 'minus', 'minus-circle-o', 'minus-circle', 'info', 'info-circle-o', 'info-circle', 'exclamation', 'exclamation-circle-o', 'exclamation-circle', 'cross', 'cross-circle-o', 'cross-circle', 'check', 'check-circle-o', 'check-circle', 'clock-circle-o', 'clock-circle'];
-const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download-line', 'edit', 'ellipsis', 'environment', 'file', 'file-text', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore', 'line-chart', 'link', 'logout', 'mail', 'menu-fold', 'menu-unfold', 'mobile', 'notification', 'paper-clip', 'picture', 'pie-chart', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'smile', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'windows', 'ie', 'chrome', 'home', 'loading'];
+
+const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download-line', 'edit', 'ellipsis', 'environment', 'file', 'file-text', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore', 'line-chart', 'link', 'logout', 'mail', 'menu-fold', 'menu-unfold', 'mobile', 'notification', 'paper-clip', 'picture', 'pie-chart', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'smile', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'windows', 'ie', 'chrome', 'home', 'loading', 'smile-circle', 'meh-circle', 'frown-circle', 'tags-o', 'tag-o', 'cloud-upload-o', 'cloud-download-o', 'cloud-upload', 'cloud-o', 'star-o', 'star', 'enviroment', 'enviroment-o', 'eye', 'eye-o', 'camera', 'camera-o', 'aliwangwang', 'aliwangwang-o', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customerservice'];
+
ReactDOM.render(, document.getElementById('iconset-direction'));
ReactDOM.render(, document.getElementById('iconset-hint'));
diff --git a/style/components/alert.less b/style/components/alert.less
index 17a259ce52..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 {
@@ -72,7 +73,7 @@
&:before {
font-weight: 700;
text-shadow: 0 1px 0 #fff;
- content: "\e61e";
+ content: "\e62d";
font-family: "anticon";
}
}
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/button.less b/style/components/button.less
index 8888164d1a..79c9ec9204 100644
--- a/style/components/button.less
+++ b/style/components/button.less
@@ -44,7 +44,7 @@
&:after {
font-family: anticon;
- content: "\e610";
+ content: "\e6a1";
position: absolute;
opacity: 0;
visibility: hidden;
diff --git a/style/components/collapse.less b/style/components/collapse.less
index 4f88f16796..ca62a6299b 100644
--- a/style/components/collapse.less
+++ b/style/components/collapse.less
@@ -35,7 +35,7 @@
color: #666;
display: inline-block;
margin-right: 8px;
- content: "\e60f";
+ content: "\e611";
vertical-align: middle;
transition: transform 0.24s ease;
top: 0;
@@ -43,7 +43,7 @@
top: ~"16px \9";
left: ~"0 \9";
&:before {
- content:"\e60f";
+ content:"\e611";
}
}
}
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 f49d0281cf..5f71af62dc 100644
--- a/style/components/datepicker/Calendar.less
+++ b/style/components/datepicker/Calendar.less
@@ -243,12 +243,12 @@
height: 20px;
text-align: center;
line-height: 20px;
- top: 6px;
+ top: 8px;
margin: 0;
}
.@{calendar-prefix-cls}-clear-btn:after {
- content: "\e620";
+ content: "\e632";
font-family: "anticon";
font-size: 12px;
color: #aaa;
diff --git a/style/components/datepicker/DecadePanel.less b/style/components/datepicker/DecadePanel.less
index 0903100732..f2b6e3a345 100644
--- a/style/components/datepicker/DecadePanel.less
+++ b/style/components/datepicker/DecadePanel.less
@@ -63,14 +63,17 @@
-webkit-user-select: none;
}
.@{calendar-prefix-cls}-decade-panel-decade:before {
- content: "\e611";
+ content: "\e600";
font-family: "anticon" !important;
}
}
.@{calendar-prefix-cls}-decade-panel-last-century-cell {
.@{calendar-prefix-cls}-decade-panel-decade {
- transform: rotate(180deg);
+
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
}
+ .@{calendar-prefix-cls}-decade-panel-decade:before {
+ content: "\e601";
+ }
}
diff --git a/style/components/datepicker/Picker.less b/style/components/datepicker/Picker.less
index f627bf1faa..a63b30f950 100644
--- a/style/components/datepicker/Picker.less
+++ b/style/components/datepicker/Picker.less
@@ -54,7 +54,7 @@
top: 50%;
margin-top: -6px;
&:after {
- content: "\e60c";
+ content: "\e654";
font-family: "anticon";
font-size: 12px;
color: #999;
diff --git a/style/components/datepicker/YearPanel.less b/style/components/datepicker/YearPanel.less
index ded66208c4..3ed7be2add 100644
--- a/style/components/datepicker/YearPanel.less
+++ b/style/components/datepicker/YearPanel.less
@@ -63,14 +63,16 @@
-webkit-user-select: none;
}
.@{calendar-prefix-cls}-year-panel-year:before {
- content: "\e611";
+ content: "\e600";
font-family: "anticon" !important;
}
}
.@{calendar-prefix-cls}-year-panel-last-decade-cell {
.@{calendar-prefix-cls}-year-panel-year {
- transform: rotate(180deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
}
+ .@{calendar-prefix-cls}-year-panel-year:before {
+ content: "\e601";
+ }
}
diff --git a/style/components/dialog/Dialog.less b/style/components/dialog/Dialog.less
index 4159219890..f505302f1e 100644
--- a/style/components/dialog/Dialog.less
+++ b/style/components/dialog/Dialog.less
@@ -61,7 +61,7 @@
right: 18px;
&:before {
- content: "\e61e";
+ content: "\e62d";
display: block;
font-family: "anticon" !important;
}
diff --git a/style/components/form.less b/style/components/form.less
index 600a6c0307..40ff6329ba 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -287,7 +287,7 @@ form {
}
&.has-feedback:after {
- content: '\e614';
+ content: '\e62f';
color: @success-color;
}
}
@@ -296,7 +296,7 @@ form {
.form-control-validation(@warning-color; @warning-color;);
&.has-feedback:after {
- content: '\e628';
+ content: '\e634';
color: @warning-color;
}
@@ -327,7 +327,7 @@ form {
.form-control-validation(@error-color; @error-color;);
&.has-feedback:after {
- content: '\e628';
+ content: '\e634';
color: @error-color;
}
@@ -359,7 +359,7 @@ form {
&.has-feedback:after {
display: inline-block;
.animation(loadingCircle 1s infinite linear );
- content:"\e610";
+ content:"\e6a1";
}
}
diff --git a/style/components/inputNumber.less b/style/components/inputNumber.less
index e9940462b1..105e3e217b 100644
--- a/style/components/inputNumber.less
+++ b/style/components/inputNumber.less
@@ -165,12 +165,9 @@
cursor: pointer;
&-inner {
top: 1px;
- .ie-rotate(2);
&:before {
text-align: center;
- content: "\e600";
- transform: rotate(180deg);
- -webkit-transform-origin: 47.5% 51%; /* fix chrome position */
+ content: "\e602";
}
}
&:hover {
@@ -188,7 +185,7 @@
&-inner {
&:before {
text-align: center;
- content: "\e600";
+ content: "\e603";
}
}
&:hover {
diff --git a/style/components/menu.less b/style/components/menu.less
index 615f125fa5..1ea351cad3 100644
--- a/style/components/menu.less
+++ b/style/components/menu.less
@@ -126,7 +126,7 @@
text-rendering: auto;
position: absolute;
transition: transform .3s ease;
- content: "\e600";
+ content: "\e603";
right: 16px;
.ie-rotate(3);
transform: rotate(270deg) scale(0.75);
@@ -141,7 +141,7 @@
text-rendering: auto;
position: absolute;
transition: transform .3s ease;
- content: "\e600";
+ content: "\e603";
right: 16px;
top: 0;
.iconfont-size-under-12px(8px);
@@ -386,4 +386,4 @@
border-right: 0px;
}
}
-}
+}
\ No newline at end of file
diff --git a/style/components/message.less b/style/components/message.less
index 1d3794f6c7..1451690c74 100644
--- a/style/components/message.less
+++ b/style/components/message.less
@@ -41,5 +41,6 @@
.anticon {
margin-right: 8px;
font-size: 14px;
+ top:2px;
}
}
diff --git a/style/components/notification.less b/style/components/notification.less
index b7bb07d523..64740b039e 100644
--- a/style/components/notification.less
+++ b/style/components/notification.less
@@ -71,7 +71,7 @@
&-close-x:after {
font-size: 12px;
- content: "\e61e";
+ content: "\e62d";
font-family: "anticon";
cursor: pointer;
}
diff --git a/style/components/pagination.less b/style/components/pagination.less
index 03ee36ce1d..ec6d797c97 100644
--- a/style/components/pagination.less
+++ b/style/components/pagination.less
@@ -74,10 +74,9 @@
}
&-jump-prev {
- .cross-rotate(180deg);
&:hover {
&:after {
- content: "\e611\e611";
+ content: "\e601\e601";
}
}
}
@@ -85,7 +84,7 @@
&-jump-next {
&:hover {
&:after {
- content: "\e611\e611";
+ content: "\e600\e600";
}
}
}
@@ -135,11 +134,10 @@
}
&-prev {
- .cross-rotate(180deg);
a {
&:after {
margin-top: -.5px;
- content: "\e611";
+ content: "\e601";
display: block;
}
}
@@ -148,7 +146,7 @@
&-next {
a {
&:after {
- content: "\e611";
+ content: "\e600";
display: block;
}
}
diff --git a/style/components/select.less b/style/components/select.less
index aa5c5a915b..6cfb4cc985 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -13,7 +13,7 @@
&:after {
.iconfont-size-under-12px(10px);
display: inline-block;
- content: '\e613';
+ content: '\e62e';
font-family: 'anticon';
font-weight: bold;
position: absolute;
@@ -21,6 +21,7 @@
right: 0;
padding-right: 14px;
color: @primary-color;
+ transform: scale(0.75)
}
}
@@ -53,7 +54,7 @@
}
&:before {
- content: '\e600';
+ content: '\e603';
transition: transform 0.2s ease;
}
}
@@ -268,7 +269,7 @@
}
&:before {
- content: "\e61e";
+ content: "\e62d";
}
}
}
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 b2dbc2da8e..9d99a9e926 100644
--- a/style/components/tabs.less
+++ b/style/components/tabs.less
@@ -97,18 +97,17 @@
right: 2px;
&-icon:before {
- content: "\e611";
+ content: "\e600";
}
}
&-tab-prev {
left: 0;
&-icon {
- transform: rotate(180deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
}
&-icon:before {
- content: "\e611";
+ content: "\e601";
}
:root & {
@@ -178,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/components/tree.less b/style/components/tree.less
index 830b58c38d..74dd927a65 100644
--- a/style/components/tree.less
+++ b/style/components/tree.less
@@ -5,7 +5,7 @@
position: relative;
&:after {
.iconfont-size-under-12px(6px);
- content: '\e60f';
+ content: '\e611';
display: inline-block;
font-family: 'anticon';
font-weight: bold;
@@ -59,7 +59,7 @@
}
&.@{tree-prefix-cls}-icon_loading {
&:after {
- content: '\e610';
+ content: '\e6a1';
display: inline-block;
font-family: 'anticon';
font-weight: bold;
diff --git a/style/components/upload.less b/style/components/upload.less
index 25e98f37b6..17bdae4c06 100644
--- a/style/components/upload.less
+++ b/style/components/upload.less
@@ -88,6 +88,7 @@
margin-right: 4px;
font-size: 12px;
color: #999;
+ top:2px;
}
.anticon-cross {
.iconfont-size-under-12px(10px);
diff --git a/style/core/iconfont.less b/style/core/iconfont.less
index 39b742b950..d278fcb683 100644
--- a/style/core/iconfont.less
+++ b/style/core/iconfont.less
@@ -14,166 +14,170 @@
.@{iconfont-css-prefix} {
.iconfont-mixin();
}
-// 方向性图标
-.@{iconfont-css-prefix}-step-backward:before {content:"\e662";}
-.@{iconfont-css-prefix}-step-forward {.ie-rotate(2);}
-.@{iconfont-css-prefix}-step-forward:before {content:"\e662";.rotate(180deg);}
-.@{iconfont-css-prefix}-fast-backward:before {content:"\e62a";}
-.@{iconfont-css-prefix}-fast-forward {.ie-rotate(2);}
-.@{iconfont-css-prefix}-fast-forward:before {content:"\e62a";.rotate(180deg);}
-.@{iconfont-css-prefix}-shrink:before {content:"\e65f";}
-.@{iconfont-css-prefix}-arrow-salt:before {content:"\e608";}
-.@{iconfont-css-prefix}-caret-down:before {content:"\e60f";}
-.@{iconfont-css-prefix}-caret-left {.ie-rotate(1);}
-.@{iconfont-css-prefix}-caret-left:before {content:"\e60f";.rotate(90deg);}
-.@{iconfont-css-prefix}-caret-up {.ie-rotate(2);}
-.@{iconfont-css-prefix}-caret-up:before {content:"\e60f";.rotate(180deg);}
-.@{iconfont-css-prefix}-caret-right {.ie-rotate(3);}
-.@{iconfont-css-prefix}-caret-right:before {content:"\e60f";.rotate(270deg);}
-.@{iconfont-css-prefix}-caret-circle-right:before {content:"\e60d";}
-.@{iconfont-css-prefix}-caret-circle-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-caret-circle-left:before {content:"\e60d";.rotate(180deg);}
-.@{iconfont-css-prefix}-caret-circle-o-right:before {content:"\e60e";}
-.@{iconfont-css-prefix}-caret-circle-o-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-caret-circle-o-left:before {content:"\e60e";.rotate(180deg);}
-.@{iconfont-css-prefix}-circle-right:before {content:"\e602";}
-.@{iconfont-css-prefix}-circle-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-circle-left:before {content:"\e602";.rotate(180deg);}
-.@{iconfont-css-prefix}-circle-o-right:before {content:"\e603";}
-.@{iconfont-css-prefix}-circle-o-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-circle-o-left:before {content:"\e603";.rotate(180deg);}
-.@{iconfont-css-prefix}-double-right:before {content:"\e604";}
-.@{iconfont-css-prefix}-double-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-double-left:before {content:"\e604";.rotate(180deg);}
-.@{iconfont-css-prefix}-verticle-right:before {content:"\e605";}
-.@{iconfont-css-prefix}-verticle-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-verticle-left:before {content:"\e605";.rotate(180deg);}
-.@{iconfont-css-prefix}-forward:before {content:"\e630";}
-.@{iconfont-css-prefix}-backward {.ie-rotate(2);}
-.@{iconfont-css-prefix}-backward:before {content:"\e630";.rotate(180deg);}
-.@{iconfont-css-prefix}-rollback:before {content:"\e65a";}
-.@{iconfont-css-prefix}-retweet:before {content:"\e659";}
-.@{iconfont-css-prefix}-right:before {content:"\e611";}
-.@{iconfont-css-prefix}-down:before {content:"\e600";}
-.@{iconfont-css-prefix}-left {.ie-rotate(2);}
-.@{iconfont-css-prefix}-left:before {content:"\e611";.rotate(180deg);}
-.@{iconfont-css-prefix}-up {.ie-rotate(2);}
-.@{iconfont-css-prefix}-up:before {content:"\e600";.rotate(180deg);}
-
-// 提示性图标
-.@{iconfont-css-prefix}-question:before {content:"\e655";}
-.@{iconfont-css-prefix}-question-circle:before {content:"\e656";}
-.@{iconfont-css-prefix}-question-circle-o:before {content:"\e657";}
-.@{iconfont-css-prefix}-plus:before {content:"\e651";}
-.@{iconfont-css-prefix}-plus-circle:before {content:"\e652";}
-.@{iconfont-css-prefix}-plus-circle-o:before {content:"\e653";}
-.@{iconfont-css-prefix}-pause:before {content:"\e64c";}
-.@{iconfont-css-prefix}-pause-circle:before {content:"\e64d";}
-.@{iconfont-css-prefix}-pause-circle-o:before {content:"\e64e";}
-.@{iconfont-css-prefix}-minus:before {content:"\e646";}
-.@{iconfont-css-prefix}-minus-circle:before {content:"\e647";}
-.@{iconfont-css-prefix}-minus-circle-o:before {content:"\e648";}
-.@{iconfont-css-prefix}-info-circle:before {content:"\e637";}
-.@{iconfont-css-prefix}-info-circle-o:before {content:"\e638";}
-.@{iconfont-css-prefix}-info:before {content:"\e63a";}
-.@{iconfont-css-prefix}-exclamation:before {content:"\e627";}
-.@{iconfont-css-prefix}-exclamation-circle:before {content:"\e628";}
-.@{iconfont-css-prefix}-exclamation-circle-o:before {content:"\e629";}
-.@{iconfont-css-prefix}-cross:before {content:"\e61e";}
-.@{iconfont-css-prefix}-cross-circle:before {content:"\e61f";}
-.@{iconfont-css-prefix}-cross-circle-o:before {content:"\e620";}
-.@{iconfont-css-prefix}-check:before {content:"\e613";}
-.@{iconfont-css-prefix}-check-circle:before {content:"\e614";}
-.@{iconfont-css-prefix}-check-circle-o:before {content:"\e615";}
-.@{iconfont-css-prefix}-clock-circle:before {content:"\e616";}
-.@{iconfont-css-prefix}-clock-circle-o:before {content:"\e617";}
-
-// 网站通用图标
-.@{iconfont-css-prefix}-lock:before {content:"\e641";}
-.@{iconfont-css-prefix}-android:before {content:"\e601";}
-.@{iconfont-css-prefix}-apple:before {content:"\e606";}
-.@{iconfont-css-prefix}-area-chart:before {content:"\e607";}
-.@{iconfont-css-prefix}-bar-chart:before {content:"\e609";}
-.@{iconfont-css-prefix}-bars:before {content:"\e60a";}
-.@{iconfont-css-prefix}-book:before {content:"\e60b";}
-.@{iconfont-css-prefix}-calendar:before {content:"\e60c";}
-.@{iconfont-css-prefix}-cloud:before {content:"\e618";}
-.@{iconfont-css-prefix}-cloud-download:before {content:"\e619";}
-.@{iconfont-css-prefix}-code:before {content:"\e61a";}
-.@{iconfont-css-prefix}-copy:before {content:"\e61c";}
-.@{iconfont-css-prefix}-credit-card:before {content:"\e61d";}
-.@{iconfont-css-prefix}-delete:before {content:"\e621";}
-.@{iconfont-css-prefix}-desktop:before {content:"\e622";}
-.@{iconfont-css-prefix}-download-line:before {content:"\e623";}
-.@{iconfont-css-prefix}-edit:before {content:"\e624";}
-.@{iconfont-css-prefix}-ellipsis:before {content:"\e625";}
-.@{iconfont-css-prefix}-environment:before {content:"\e626";}
-.@{iconfont-css-prefix}-file:before {content:"\e62c";}
-.@{iconfont-css-prefix}-file-text:before {content:"\e62d";}
-.@{iconfont-css-prefix}-folder:before {content:"\e62e";}
-.@{iconfont-css-prefix}-folder-open:before {content:"\e62f";}
-.@{iconfont-css-prefix}-github:before {content:"\e631";}
-.@{iconfont-css-prefix}-hdd:before {content:"\e632";}
-.@{iconfont-css-prefix}-frown:before {content:"\e633";}
-.@{iconfont-css-prefix}-meh:before {content:"\e634";}
-.@{iconfont-css-prefix}-inbox:before {content:"\e635";}
-.@{iconfont-css-prefix}-laptop:before {content:"\e63d";}
-.@{iconfont-css-prefix}-appstore:before {content:"\e63e";}
-.@{iconfont-css-prefix}-line-chart:before {content:"\e63f";}
-.@{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 {.ie-rotate(2);}
-.@{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";}
-.@{iconfont-css-prefix}-paper-clip:before {content:"\e64b";}
-.@{iconfont-css-prefix}-picture:before {content:"\e64f";}
-.@{iconfont-css-prefix}-pie-chart:before {content:"\e650";}
-.@{iconfont-css-prefix}-poweroff:before {content:"\e654";}
-.@{iconfont-css-prefix}-reload:before {content:"\e658";}
-.@{iconfont-css-prefix}-search:before {content:"\e65b";}
-.@{iconfont-css-prefix}-setting:before {content:"\e65c";}
-.@{iconfont-css-prefix}-share-alt:before {content:"\e65d";}
-.@{iconfont-css-prefix}-shopping-cart:before {content:"\e65e";}
-.@{iconfont-css-prefix}-smile:before {content:"\e661";}
-.@{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}-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}-home:before {content:"\e612";}
+.@{iconfont-css-prefix}-iconfont-caretcircle-o-up:before{content:"\e60c";}
+.@{iconfont-css-prefix}-android:before {content:"\e64f";}
+.@{iconfont-css-prefix}-chrome:before {content:"\e65c";}
+.@{iconfont-css-prefix}-appstore:before {content:"\e64d";}
+.@{iconfont-css-prefix}-apple:before {content:"\e64e";}
+.@{iconfont-css-prefix}-github:before {content:"\e674";}
+.@{iconfont-css-prefix}-inbox:before {content:"\e67b";}
+.@{iconfont-css-prefix}-ie:before {content:"\e67c";}
+.@{iconfont-css-prefix}-smile:before {content:"\e677";}
+.@{iconfont-css-prefix}-smile-circle:before {content:"\e676";}
+.@{iconfont-css-prefix}-meh-circle:before {content:"\e678";}
+.@{iconfont-css-prefix}-frown:before {content:"\e673";}
+.@{iconfont-css-prefix}-frown-circle:before {content:"\e672";}
+.@{iconfont-css-prefix}-meh:before {content:"\e679";}
+.@{iconfont-css-prefix}-pie-chart:before {content:"\e68a";}
+.@{iconfont-css-prefix}-tags:before {content:"\e656";}
+.@{iconfont-css-prefix}-tags-o:before {content:"\e657";}
+.@{iconfont-css-prefix}-tag:before {content:"\e658";}
+.@{iconfont-css-prefix}-tag-o:before {content:"\e659";}
+.@{iconfont-css-prefix}-cloud:before {content:"\e65a";}
+.@{iconfont-css-prefix}-cloud-upload-o:before {content:"\e697";}
+.@{iconfont-css-prefix}-cloud-download-o:before {content:"\e698";}
+.@{iconfont-css-prefix}-cloud-upload:before {content:"\e696";}
+.@{iconfont-css-prefix}-cloud-o:before {content:"\e699";}
+.@{iconfont-css-prefix}-cloud-download:before {content:"\e65b";}
+.@{iconfont-css-prefix}-star-o:before {content:"\e693";}
+.@{iconfont-css-prefix}-star:before {content:"\e694";}
+.@{iconfont-css-prefix}-enviroment:before {content:"\e665";}
+.@{iconfont-css-prefix}-enviroment-o:before {content:"\e666";}
+.@{iconfont-css-prefix}-eye:before {content:"\e66e";}
+.@{iconfont-css-prefix}-eye-o:before {content:"\e66d";}
+.@{iconfont-css-prefix}-camera:before {content:"\e653";}
+.@{iconfont-css-prefix}-camera-o:before {content:"\e652";}
+.@{iconfont-css-prefix}-aliwangwang:before {content:"\e64b";}
+.@{iconfont-css-prefix}-aliwangwang-o:before {content:"\e64a";}
+.@{iconfont-css-prefix}-windows:before {content:"\e6a0";}
+.@{iconfont-css-prefix}-shopping-cart:before {content:"\e692";}
+.@{iconfont-css-prefix}-unlock:before {content:"\e69f";}
+.@{iconfont-css-prefix}-lock:before {content:"\e69d";}
+.@{iconfont-css-prefix}-save:before {content:"\e69e";}
+.@{iconfont-css-prefix}-user:before {content:"\e69c";}
+.@{iconfont-css-prefix}-video-camera:before {content:"\e69b";}
+.@{iconfont-css-prefix}-to-top:before {content:"\e69a";}
+.@{iconfont-css-prefix}-team:before {content:"\e680";}
+.@{iconfont-css-prefix}-tablet:before {content:"\e695";}
+.@{iconfont-css-prefix}-solution:before {content:"\e68f";}
+.@{iconfont-css-prefix}-poweroff:before {content:"\e691";}
+.@{iconfont-css-prefix}-search:before {content:"\e690";}
+.@{iconfont-css-prefix}-share-alt:before {content:"\e68e";}
+.@{iconfont-css-prefix}-setting:before {content:"\e68d";}
+.@{iconfont-css-prefix}-search:before {content:"\e68c";}
+.@{iconfont-css-prefix}-poweroff:before {content:"\e68b";}
+.@{iconfont-css-prefix}-picture:before {content:"\e689";}
+.@{iconfont-css-prefix}-phone:before {content:"\e688";}
+.@{iconfont-css-prefix}-paper-clip:before {content:"\e687";}
+.@{iconfont-css-prefix}-notification:before {content:"\e686";}
+.@{iconfont-css-prefix}-mobile:before {content:"\e685";}
+.@{iconfont-css-prefix}-menu-fold:before {content:"\e684";}
+.@{iconfont-css-prefix}-menu-unfold:before {content:"\e683";}
+.@{iconfont-css-prefix}-mail:before {content:"\e682";}
+.@{iconfont-css-prefix}-logout:before {content:"\e681";}
+.@{iconfont-css-prefix}-link:before {content:"\e67e";}
+.@{iconfont-css-prefix}-line-chart:before {content:"\e67f";}
+.@{iconfont-css-prefix}-home:before {content:"\e67d";}
+.@{iconfont-css-prefix}-laptop:before {content:"\e67a";}
+.@{iconfont-css-prefix}-hdd:before {content:"\e675";}
+.@{iconfont-css-prefix}-folder-open:before {content:"\e671";}
+.@{iconfont-css-prefix}-folder:before {content:"\e670";}
+.@{iconfont-css-prefix}-filter:before {content:"\e66f";}
+.@{iconfont-css-prefix}-file-text:before {content:"\e66c";}
+.@{iconfont-css-prefix}-file:before {content:"\e66b";}
+.@{iconfont-css-prefix}-exception:before {content:"\e66a";}
+.@{iconfont-css-prefix}-export:before {content:"\e669";}
+.@{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}-download-line:before {content:"\e664";}
+.@{iconfont-css-prefix}-delete:before {content:"\e661";}
+.@{iconfont-css-prefix}-copy:before {content:"\e660";}
+.@{iconfont-css-prefix}-customerservice:before {content:"\e65e";}
+.@{iconfont-css-prefix}-credit-card:before {content:"\e65f";}
+.@{iconfont-css-prefix}-code:before {content:"\e65d";}
+.@{iconfont-css-prefix}-calendar:before {content:"\e654";}
+.@{iconfont-css-prefix}-book:before {content:"\e655";}
+.@{iconfont-css-prefix}-bars:before {content:"\e650";}
+.@{iconfont-css-prefix}-bar-chart:before {content:"\e651";}
+.@{iconfont-css-prefix}-area-chart:before {content:"\e64c";}
+.@{iconfont-css-prefix}-question-circle-o:before {content:"\e648";}
+.@{iconfont-css-prefix}-question:before {content:"\e649";}
+.@{iconfont-css-prefix}-question-circle:before {content:"\e647";}
+.@{iconfont-css-prefix}-pause-circle:before {content:"\e644";}
+.@{iconfont-css-prefix}-pause:before {content:"\e646";}
+.@{iconfont-css-prefix}-pause-circle-o:before {content:"\e645";}
+.@{iconfont-css-prefix}-clock-circle:before {content:"\e642";}
+.@{iconfont-css-prefix}-clock-circle-o:before {content:"\e643";}
+.@{iconfont-css-prefix}-swap:before {content:"\e641";}
+.@{iconfont-css-prefix}-swap-left:before {content:"\e63f";}
+.@{iconfont-css-prefix}-swap-right:before {content:"\e640";}
+.@{iconfont-css-prefix}-plus-circle:before {content:"\e63d";}
+.@{iconfont-css-prefix}-plus:before {content:"\e63e";}
+.@{iconfont-css-prefix}-plus-circle-o:before {content:"\e63c";}
+.@{iconfont-css-prefix}-minus:before {content:"\e63b";}
+.@{iconfont-css-prefix}-minus-circle-o:before {content:"\e63a";}
+.@{iconfont-css-prefix}-minus-circle:before {content:"\e639";}
+.@{iconfont-css-prefix}-info-circle-o:before {content:"\e638";}
+.@{iconfont-css-prefix}-info-circle:before {content:"\e637";}
+.@{iconfont-css-prefix}-info:before {content:"\e636";}
+.@{iconfont-css-prefix}-exclamation-circle:before {content:"\e634";}
+.@{iconfont-css-prefix}-exclamation-circle-o:before {content:"\e635";}
+.@{iconfont-css-prefix}-exclamation:before {content:"\e633";}
+.@{iconfont-css-prefix}-cross-circle:before {content:"\e631";}
+.@{iconfont-css-prefix}-cross-circle-o:before {content:"\e632";}
+.@{iconfont-css-prefix}-check-circle:before {content:"\e62f";}
+.@{iconfont-css-prefix}-check-circle-o:before {content:"\e630";}
+.@{iconfont-css-prefix}-cross:before {content:"\e62d";}
+.@{iconfont-css-prefix}-check:before {content:"\e62e";}
+.@{iconfont-css-prefix}-verticle-right:before {content:"\e62c";}
+.@{iconfont-css-prefix}-verticle-left:before {content:"\e62b";}
+.@{iconfont-css-prefix}-rollback:before {content:"\e62a";}
+.@{iconfont-css-prefix}-retweet:before {content:"\e627";}
+.@{iconfont-css-prefix}-shrink:before {content:"\e628";}
+.@{iconfont-css-prefix}-arrow-salt:before {content:"\e629";}
+.@{iconfont-css-prefix}-reload:before {content:"\e626";}
+.@{iconfont-css-prefix}-double-right:before {content:"\e625";}
+.@{iconfont-css-prefix}-double-left:before {content:"\e624";}
+.@{iconfont-css-prefix}-arrow-right:before {content:"\e621";}
+.@{iconfont-css-prefix}-arrow-up:before {content:"\e622";}
+.@{iconfont-css-prefix}-arrow-down:before {content:"\e623";}
+.@{iconfont-css-prefix}-arrow-left:before {content:"\e620";}
+.@{iconfont-css-prefix}-left:before {content:"\e601";}
+.@{iconfont-css-prefix}-right:before {content:"\e600";}
+.@{iconfont-css-prefix}-down:before {content:"\e603";}
+.@{iconfont-css-prefix}-up:before {content:"\e602";}
+.@{iconfont-css-prefix}-play-circle:before {content:"\e61e";}
+.@{iconfont-css-prefix}-play-circle-o:before {content:"\e61f";}
+.@{iconfont-css-prefix}-circle-left:before {content:"\e61b";}
+.@{iconfont-css-prefix}-circle-up:before {content:"\e61c";}
+.@{iconfont-css-prefix}-circle-down:before {content:"\e61d";}
+.@{iconfont-css-prefix}-circle-right:before {content:"\e61a";}
+.@{iconfont-css-prefix}-circle-o-right:before {content:"\e616";}
+.@{iconfont-css-prefix}-circle-o-up:before {content:"\e618";}
+.@{iconfont-css-prefix}-circle-o-down:before {content:"\e617";}
+.@{iconfont-css-prefix}-circle-o-left:before {content:"\e619";}
+.@{iconfont-css-prefix}-step-backward:before {content:"\e614";}
+.@{iconfont-css-prefix}-step-forward:before {content:"\e615";}
+.@{iconfont-css-prefix}-fast-backward:before {content:"\e613";}
+.@{iconfont-css-prefix}-fast-forward:before {content:"\e612";}
+.@{iconfont-css-prefix}-caret-left:before {content:"\e60f";}
+.@{iconfont-css-prefix}-caret-right:before {content:"\e60a";}
+.@{iconfont-css-prefix}-caret-down:before {content:"\e611";}
+.@{iconfont-css-prefix}-caret-up:before {content:"\e610";}
+.@{iconfont-css-prefix}-forward:before {content:"\e608";}
+.@{iconfont-css-prefix}-backward:before {content:"\e609";}
+.@{iconfont-css-prefix}-caret-circle-o-down:before {content:"\e60e";}
+.@{iconfont-css-prefix}-caret-circle-o-right:before {content:"\e60d";}
+.@{iconfont-css-prefix}-caret-circle-o-left:before {content:"\e60b";}
+.@{iconfont-css-prefix}-caret-circle-left:before {content:"\e604";}
+.@{iconfont-css-prefix}-caret-circle-right:before {content:"\e605";}
+.@{iconfont-css-prefix}-caret-circle-up:before {content:"\e606";}
+.@{iconfont-css-prefix}-caret-circle-down:before {content:"\e607";}
.@{iconfont-css-prefix}-loading:before {
display: inline-block;
.animation(loadingCircle 1s infinite linear);
- content:"\e610";
-}
-
-:root {
- .@{iconfont-css-prefix}-step-forward,
- .@{iconfont-css-prefix}-fast-forward,
- .@{iconfont-css-prefix}-left,
- .@{iconfont-css-prefix}-up,
- .@{iconfont-css-prefix}-down,
- .@{iconfont-css-prefix}-caret-left,
- .@{iconfont-css-prefix}-caret-up,
- .@{iconfont-css-prefix}-caret-right,
- .@{iconfont-css-prefix}-caret-circle-left,
- .@{iconfont-css-prefix}-caret-circle-o-left,
- .@{iconfont-css-prefix}-circle-left,
- .@{iconfont-css-prefix}-circle-o-left,
- .@{iconfont-css-prefix}-double-left,
- .@{iconfont-css-prefix}-verticle-left,
- .@{iconfont-css-prefix}-backward,
- .@{iconfont-css-prefix}-menu-fold {
- filter: none;
- }
+ content:"\e6a1";
}
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 {
diff --git a/style/mixins/iconfont.less b/style/mixins/iconfont.less
index b1f60c408a..f2e35cb068 100644
--- a/style/mixins/iconfont.less
+++ b/style/mixins/iconfont.less
@@ -6,6 +6,7 @@
text-align: center;
text-transform: none;
text-rendering: auto;
+ line-height: 1;
&:before {
display: block;
diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less
index 5a15ae04fc..ecc5d0cf38 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_1440074043_6914854";
+@icon-url : "//at.alicdn.com/t/font_1447430015_7197566";
// LINK
@link-color : #2db7f5;