From 354759cb17bd6f7f87301ebfa479887351e26efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Sun, 18 Sep 2016 09:54:47 +0800 Subject: [PATCH] Redesigned icons (#3041) * redesigned icons * change iconfont content * use same icons * fix missing icons * improve icon size --- components/cascader/style/index.less | 4 +- components/checkbox/style/mixin.less | 2 +- components/collapse/style/index.less | 4 +- components/date-picker/style/Calendar.less | 2 +- components/date-picker/style/DecadePanel.less | 4 +- components/date-picker/style/Picker.less | 2 +- components/date-picker/style/TimePicker.less | 2 +- components/date-picker/style/YearPanel.less | 4 +- components/dropdown/style/index.less | 2 +- components/form/style/index.less | 8 +- components/icon/index.en-US.md | 14 +- components/icon/index.zh-CN.md | 14 +- components/input-number/style/index.less | 4 +- components/menu/style/index.less | 4 +- components/modal/style/modal.less | 2 +- components/notification/style/index.less | 2 +- components/pagination/style/index.less | 8 +- components/rate/style/index.less | 4 +- components/select/style/index.less | 10 +- components/style/core/iconfont.less | 401 ++++++++++-------- components/style/themes/default.less | 2 +- components/table/Table.tsx | 2 +- components/table/style/index.less | 60 +-- components/tabs/style/index.less | 4 +- components/time-picker/style/index.less | 4 +- components/tree/style/mixin.less | 2 +- site/theme/static/common.less | 2 +- site/theme/static/markdown.less | 2 +- site/theme/static/page-nav.less | 6 +- site/theme/template/IconSet/index.jsx | 10 +- 30 files changed, 285 insertions(+), 306 deletions(-) diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less index 366d385e00..de9cf3e05e 100644 --- a/components/cascader/style/index.less +++ b/components/cascader/style/index.less @@ -80,7 +80,7 @@ margin-top: -6px; line-height: 12px; color: #999; - .iconfont-size-under-12px(8px); + .iconfont-size-under-12px(9px); &:before { transition: transform 0.2s ease; } @@ -170,7 +170,7 @@ &-expand { position: relative; &:after { - .iconfont-font("\e600"); + .iconfont-font("\e61f"); .iconfont-size-under-12px(8px); color: #999; position: absolute; diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less index ace7964658..3c3c8607e6 100644 --- a/components/checkbox/style/mixin.less +++ b/components/checkbox/style/mixin.less @@ -186,7 +186,7 @@ @media @ie8 { .@{checkbox-prefix-cls}-checked .@{checkbox-prefix-cls}-inner:before, .@{checkbox-prefix-cls}-checked .@{checkbox-prefix-cls}-inner:after { - .iconfont-font("\e62e"); + .iconfont-font("\e632"); font-weight: bold; font-size: 8px; border: 0; diff --git a/components/collapse/style/index.less b/components/collapse/style/index.less index ff9754e38c..b1b0ff3ae6 100644 --- a/components/collapse/style/index.less +++ b/components/collapse/style/index.less @@ -37,7 +37,7 @@ display: inline-block; margin-right: 8px; line-height: 40px; - content: "\e611"; + content: "\e606"; vertical-align: middle; transition: transform 0.24s ease; top: 0; @@ -45,7 +45,7 @@ top: ~"16px \9"; left: ~"0 \9"; &:before { - content: "\e611"; + content: "\e606"; } } } diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less index cf9d0d785a..256b6223f2 100644 --- a/components/date-picker/style/Calendar.less +++ b/components/date-picker/style/Calendar.less @@ -280,7 +280,7 @@ } .@{calendar-prefix-cls}-clear-btn:after { - .iconfont-font("\e631"); + .iconfont-font("\e62e"); font-size: 12px; color: #ccc; display: inline-block; diff --git a/components/date-picker/style/DecadePanel.less b/components/date-picker/style/DecadePanel.less index 7985a26805..87016f0676 100644 --- a/components/date-picker/style/DecadePanel.less +++ b/components/date-picker/style/DecadePanel.less @@ -63,13 +63,13 @@ user-select: none; } .@{calendar-prefix-cls}-decade-panel-decade:before { - content: "\e600"; + content: "\e61f"; font-family: "anticon" !important; } } .@{calendar-prefix-cls}-decade-panel-last-century-cell { .@{calendar-prefix-cls}-decade-panel-decade:before { - content: "\e601"; + content: "\e620"; } } diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index d2c1c05ef4..8d38a0dbf1 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -73,7 +73,7 @@ top: 50%; margin-top: -6px; &:after { - content: "\e654"; + content: "\e6bb"; font-family: "anticon"; font-size: 12px; color: #999; diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less index e4680e1b78..0240ece24b 100644 --- a/components/date-picker/style/TimePicker.less +++ b/components/date-picker/style/TimePicker.less @@ -60,7 +60,7 @@ } &-clear-btn:after { - content: "\e631"; + content: "\e62e"; font-family: "anticon"; font-size: 12px; color: #ccc; diff --git a/components/date-picker/style/YearPanel.less b/components/date-picker/style/YearPanel.less index cdc253aeef..8ef89c21f4 100644 --- a/components/date-picker/style/YearPanel.less +++ b/components/date-picker/style/YearPanel.less @@ -63,13 +63,13 @@ user-select: none; } .@{calendar-prefix-cls}-year-panel-year:before { - content: "\e600"; + content: "\e61f"; font-family: "anticon" !important; } } .@{calendar-prefix-cls}-year-panel-last-decade-cell { .@{calendar-prefix-cls}-year-panel-year:before { - content: "\e601"; + content: "\e620"; } } diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index b5415e7c20..9ca5031c2a 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -107,7 +107,7 @@ &-submenu-title:after { font-family: "anticon" !important; position: absolute; - content: "\e600"; + content: "\e61f"; right: 15px; color: #999; .iconfont-size-under-12px(9px); diff --git a/components/form/style/index.less b/components/form/style/index.less index 56cc8addd6..893bd445b6 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -323,7 +323,7 @@ form { } &.has-feedback:after { - content: '\e62f'; + content: '\e630'; color: @success-color; } } @@ -332,7 +332,7 @@ form { .form-control-validation(@warning-color; @warning-color;); &.has-feedback:after { - content: '\e634'; + content: '\e62c'; color: @warning-color; } @@ -372,7 +372,7 @@ form { .form-control-validation(@error-color; @error-color;); &.has-feedback:after { - content: '\e631'; + content: '\e62e'; color: @error-color; } @@ -425,7 +425,7 @@ form { &.has-feedback:after { display: inline-block; animation: loadingCircle 1s infinite linear; - content: "\e6a1"; + content: "\e6ae"; color: #999; } } diff --git a/components/icon/index.en-US.md b/components/icon/index.en-US.md index c5d1e1c840..61f74a945a 100644 --- a/components/icon/index.en-US.md +++ b/components/icon/index.en-US.md @@ -41,25 +41,19 @@ By default, icon components uses [iconfont.cn](http://iconfont.cn), publicly ava ```__react import IconSet from 'site/theme/template/IconSet'; -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', 'enter', '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-up', 'caret-circle-o-down', 'caret-circle-up', 'caret-circle-down']; - -ReactDOM.render(, mountNode); +ReactDOM.render(, mountNode); ``` ### Suggested Icons ```__react -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', 'plus-square', 'minus-square', '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']; - -ReactDOM.render(, mountNode); +ReactDOM.render(, mountNode); ``` ### Other Icons ```__react -const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'edit', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf','file-excel', 'file-jpg', 'file-ppt', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore-o', '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', 'heart-o', 'heart', 'environment', 'environment-o', 'eye', 'eye-o', 'camera', 'camera-o', 'aliwangwang', 'aliwangwang-o', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customerservice', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'pay-circle-o', 'calculator', 'pushpin', 'pushpin-o']; - -ReactDOM.render(, mountNode); +ReactDOM.render(, mountNode); ```