Merge branch 'master' of github.com:ant-design/ant-design

components/button/demo/basic.md

-# Standard Button
+# 标准按钮
 
 - order: 1 
 
-按钮样式
+为 `<button>` `<a>` 或 `<input>` 元素添加 `.ant-btn` 类即可使用 ant-design 提供的样式。
 
-为 `<button>`、`<a>` 或 `<input>` 元素添加按钮类即可使用 ant-design 提供的样式。
+另外，通过使用下面的类可创建带有预定义样式的按钮，我们通过样式来显示重要程度的不同。
+
+`.ant-btn-primary` `.ant-btn-ghost`
+
+其中 `.ant-btn` 类定义了按钮的默认样式，语义上代表次按钮。
+
+**注**: 当按钮文字为两个字时，中间需要**间隔一个字符**。
 
 ---
 
@@ -13,4 +19,16 @@
 <a href="javascript:;" class="ant-btn" role="button">Link</a>
 <input class="ant-btn" type="button" value="Input" />
 <input class="ant-btn" type="submit" value="Submit" />
+
+<br>
+
+<!-- Styled Button -->
+<button class="ant-btn ant-btn-primary">主按钮</button>
+<button class="ant-btn">次按钮</button>
+<button class="ant-btn ant-btn-ghost">幽灵按钮</button>
+
+<br>
+
+<button class="ant-btn ant-btn-primary">按 钮</button>
+
 ````

components/button/demo/button-group.md

-# Groups Button
+# 按钮组合
 
 - order: 7
 
-按钮组合
-
-将一系列的 `.ant-btn` 放入 `.ant-btn-group` 的容器中
+将一系列的 `.ant-btn` 放入 `.ant-btn-group` 的容器中。
 
 按钮组合尺寸
 
@@ -79,16 +77,14 @@
 
 <style>
 .nico-insert-code h4 {
+  margin: 8px 0;
   font-size: 12px;
+  line-height: 12px;
   font-weight: normal;
 }
 .nico-insert-code h4:first-child {
   margin-top: 0;
 }
-.nico-insert-code .ant-btn-group {
-  margin-top: 16px;
-  margin-left: 8px;
-}
 .nico-insert-code .ant-btn {
   margin-bottom: 8px;
 }

components/button/demo/icon.md

-# Icon Button
+# 图标按钮
 
-- order: 5
-
-图标按钮
+- order: 4
 
 ---
 

components/button/demo/loading.md

-# Loading Button
+# 加载按钮
 
-- order: 8
-
-加载按钮
+- order: 6
 
 ---
 

components/button/demo/menu.md

-# Menu Button
+# 菜单按钮
 
-- order: 6
-
-菜单按钮
+- order: 5
 
 **注**: 下拉按钮的 icon 大小统一成 **10px**。
 
+> 更多交互，详见 [Dropdown 下拉菜单](http://ant.design/components/dropdown/)。
+
 ---
 
 ````html

components/button/demo/size.md

-# Button sizes
+# 按钮尺寸
 
-- order: 3
+- order: 2
 
-按钮尺寸
+提供 大 中 小 三种尺寸。
 
-提供 大 中 小 三种尺寸
-
-使用 `.ant-btn-lg` `.ant-btn-sm` 即可获得大 小尺寸，默认尺寸为中 
+使用 `.ant-btn-lg` `.ant-btn-sm` 即可获得大 小尺寸，默认尺寸为中。
 
 ---
 

components/button/demo/status.md

-# Button Status
+# 按钮状态
 
-- order: 4
+- order: 3
 
-通过背景色透明度的变化来体现不同的操作状态
+通过背景色透明度的变化来体现不同的操作状态。
 
-通过 `:hover` `:active` 伪状态实现，如需要表现出同 `:active` 的外观时可以添加 `.active` 类
+通过 `:hover` `:active` 伪状态实现，如需要表现出同 `:active` 的外观时可以添加 `.active` 类。
 
-失效状态：为 `<button>` 元素添加 `disabled` 属性，即可体现
+失效状态：为 `<button>` 元素添加 `disabled` 属性，即可体现。
 
 ---
 

components/button/demo/styled.md

-# Styled Button
-
-- order: 2 
-
-预定义样式按钮: 
-
-  使用下面列出的类即可创建带有预定义样式的按钮，我们通过样式来显示重要程度的不同。
-
-  `ant-btn-primary`、`ant-btn`、`ant-btn-ghost`
-
-  其中 `ant-btn` 为按钮默认样式，语义上代表次按钮
-
-**注**: 当按钮文字为两个字时，中间需要**间隔一个字符**。
-
----
-
-````html
-<button class="ant-btn ant-btn-primary">主按钮</button>
-<button class="ant-btn">次按钮</button>
-<button class="ant-btn ant-btn-ghost">幽灵按钮</button>
-````

components/button/index.md

@@ -6,7 +6,7 @@
 
 ---
 
-鲜嫩多汁的按钮，用于触发用户指令。
+按钮用于开始一个即时操作。
 
 ## 何时使用
 
@@ -34,8 +34,8 @@
 
 | 类名  | 说明 |
 | ------------- | ------------- |
-| `.ant-btn`  | 按钮基础样式 |
+| `.ant-btn`  | 按钮基础样式。 |
 | `.ant-btn-primary` `.ant-btn-ghost`  | 使用这些列出的类可以快速创建一个带有预定义样式的按钮。  |
-| `.ant-btn-circle` `.ant-btn-circle-outline`  | 用于创建圆形按钮，`.ant-btn-circle-outline` 为描边按钮 |
-| `.ant-btn-lg` `.ant-btn-sm`  | 定义按钮大小尺寸, 目前提供三种尺寸：大中小，默认为中 |
-| `.ant-btn-group` | 按钮组合，通过按钮组容器把一组按钮放在同一行里 |
+| `.ant-btn-circle` `.ant-btn-circle-outline`  | 用于创建圆形按钮，`.ant-btn-circle-outline` 为描边按钮。 |
+| `.ant-btn-lg` `.ant-btn-sm`  | 定义按钮大小尺寸，目前提供三种尺寸：大中小，默认为中。 |
+| `.ant-btn-group` | 按钮组合，通过按钮组容器把一组按钮放在同一行里。 |

components/iconfont/index.md

@@ -7,9 +7,21 @@
 
 ---
 
+## 图标的命名规范
+
+我们为每个图标赋予了语义化的命名。我们的命名规范如下：
+
+- 1. 使用 **-** 来连接单词；
+
+- 2. 实心和描线 icon 保持同名，用 **-o** 来区分，比如 question-circle(实心) 和 question-circle-o(描线)；
+
+- 3. 命名顺序：[icon名]-[描线与否]-[方向]。
+
+每个图标的类名需要在图标名称前加上 **anticon-** 前缀，如 `.anticon-question-circle`。
+
 ## 如何使用
 
-我们对每个图标都采用了语义化的命名，使用时所有的图标都需要一个基类 `.anticon` 和对应每个图标的类。在这里，我们使用 `<i>` 标签，如下面代码演示使用即可~
+使用时所有的图标都需要一个基类 `.anticon` 和对应每个图标的类。在这里，我们使用 `<i>` 标签，如下面代码演示使用即可~
 
 ```html
 <i class="anticon anticon-link"></i>
@@ -78,14 +90,6 @@
 		<i class="anticon anticon-caret-right"></i>
 		<span class="anticon-class">caret-right</span>
 	</li>
-	<li>
-		<i class="anticon anticon-caret-round-right"></i>
-		<span class="anticon-class">caret-round-right</span>
-	</li>
-	<li>
-		<i class="anticon anticon-caret-round-left"></i>
-		<span class="anticon-class">caret-round-left</span>
-	</li>
 	<li>
 		<i class="anticon anticon-caret-circle-right"></i>
 		<span class="anticon-class">caret-circle-right</span>
@@ -95,12 +99,12 @@
 		<span class="anticon-class">caret-circle-left</span>
 	</li>
 	<li>
-		<i class="anticon anticon-round-right"></i>
-		<span class="anticon-class">round-right</span>
+		<i class="anticon anticon-caret-circle-o-right"></i>
+		<span class="anticon-class">caret-circle-o-right</span>
 	</li>
 	<li>
-		<i class="anticon anticon-round-left"></i>
-		<span class="anticon-class">round-left</span>
+		<i class="anticon anticon-caret-circle-o-left"></i>
+		<span class="anticon-class">caret-circle-o-left</span>
 	</li>
 	<li>
 		<i class="anticon anticon-circle-right"></i>
@@ -110,6 +114,14 @@
 		<i class="anticon anticon-circle-left"></i>
 		<span class="anticon-class">circle-left</span>
 	</li>
+	<li>
+		<i class="anticon anticon-circle-o-right"></i>
+		<span class="anticon-class">circle-o-right</span>
+	</li>
+	<li>
+		<i class="anticon anticon-circle-o-left"></i>
+		<span class="anticon-class">circle-o-left</span>
+	</li>
 	<li>
 		<i class="anticon anticon-double-right"></i>
 		<span class="anticon-class">double-right</span>
@@ -152,8 +164,8 @@
 		<span class="anticon-class">question</span>
 	</li>
 	<li>
-		<i class="anticon anticon-question-round"></i>
-		<span class="anticon-class">question-round</span>
+		<i class="anticon anticon-question-circle-o"></i>
+		<span class="anticon-class">question-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-question-circle"></i>
@@ -164,8 +176,8 @@
 		<span class="anticon-class">plus</span>
 	</li>
 	<li>
-		<i class="anticon anticon-plus-round"></i>
-		<span class="anticon-class">plus-round</span>
+		<i class="anticon anticon-plus-circle-o"></i>
+		<span class="anticon-class">plus-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-plus-circle"></i>
@@ -176,8 +188,8 @@
 		<span class="anticon-class">pause</span>
 	</li>
 	<li>
-		<i class="anticon anticon-pause-round"></i>
-		<span class="anticon-class">pause-round</span>
+		<i class="anticon anticon-pause-circle-o"></i>
+		<span class="anticon-class">pause-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-pause-circle"></i>
@@ -188,64 +200,64 @@
 		<span class="anticon-class">minus</span>
 	</li>
 	<li>
-		<i class="anticon anticon-minus-round"></i>
-		<span class="anticon-class">minus-round</span>
+		<i class="anticon anticon-minus-circle-o"></i>
+		<span class="anticon-class">minus-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-minus-circle"></i>
 		<span class="anticon-class">minus-circle</span>
 	</li>
 	<li>
-		<i class="anticon anticon-info-round"></i>
-		<span class="anticon-class">info-round</span>
+		<i class="anticon anticon-info"></i>
+		<span class="anticon-class">info</span>
 	</li>
 	<li>
-		<i class="anticon anticon-info-circle"></i>
-		<span class="anticon-class">info-circle</span>
+		<i class="anticon anticon-info-circle-o"></i>
+		<span class="anticon-class">info-circle-o</span>
 	</li>
 	<li>
-		<i class="anticon anticon-info"></i>
-		<span class="anticon-class">info</span>
+		<i class="anticon anticon-info-circle"></i>
+		<span class="anticon-class">info-circle</span>
 	</li>
 	<li>
 		<i class="anticon anticon-exclamation"></i>
 		<span class="anticon-class">exclamation</span>
 	</li>
 	<li>
-		<i class="anticon anticon-exclamation-round"></i>
-		<span class="anticon-class">exclamation-round</span>
+		<i class="anticon anticon-exclamation-circle-o"></i>
+		<span class="anticon-class">exclamation-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-exclamation-circle"></i>
 		<span class="anticon-class">exclamation-circle</span>
 	</li>
-	<li>
-		<i class="anticon anticon-cross-circle"></i>
-		<span class="anticon-class">cross-circle</span>
-	</li>
-	<li>
-		<i class="anticon anticon-cross-round"></i>
-		<span class="anticon-class">cross-round</span>
-	</li>
 	<li>
 		<i class="anticon anticon-cross"></i>
 		<span class="anticon-class">cross</span>
 	</li>
 	<li>
-		<i class="anticon anticon-check-circle"></i>
-		<span class="anticon-class">check-circle</span>
+		<i class="anticon anticon-cross-circle-o"></i>
+		<span class="anticon-class">cross-circle-o</span>
 	</li>
 	<li>
-		<i class="anticon anticon-check-round"></i>
-		<span class="anticon-class">check-round</span>
+		<i class="anticon anticon-cross-circle"></i>
+		<span class="anticon-class">cross-circle</span>
 	</li>
 	<li>
 		<i class="anticon anticon-check"></i>
 		<span class="anticon-class">check</span>
 	</li>
 	<li>
-		<i class="anticon anticon-clock-round"></i>
-		<span class="anticon-class">clock-round</span>
+		<i class="anticon anticon-check-circle-o"></i>
+		<span class="anticon-class">check-circle-o</span>
+	</li>
+	<li>
+		<i class="anticon anticon-check-circle"></i>
+		<span class="anticon-class">check-circle</span>
+	</li>
+	<li>
+		<i class="anticon anticon-clock-circle-o"></i>
+		<span class="anticon-class">clock-circle-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-clock-circle"></i>
@@ -285,8 +297,8 @@
 		<span class="anticon-class">bars</span>
 	</li>
 	<li>
-		<i class="anticon anticon-booko"></i>
-		<span class="anticon-class">booko</span>
+		<i class="anticon anticon-book-o"></i>
+		<span class="anticon-class">book-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-calendar"></i>
@@ -337,36 +349,36 @@
 		<span class="anticon-class">environment</span>
 	</li>
 	<li>
-		<i class="anticon anticon-fileo"></i>
-		<span class="anticon-class">fileo</span>
+		<i class="anticon anticon-file-o"></i>
+		<span class="anticon-class">file-o</span>
 	</li>
 	<li>
-		<i class="anticon anticon-file-texto"></i>
-		<span class="anticon-class">file-texto</span>
+		<i class="anticon anticon-file-text-o"></i>
+		<span class="anticon-class">file-text-o</span>
 	</li>
 	<li>
-		<i class="anticon anticon-foldero"></i>
-		<span class="anticon-class">foldero</span>
+		<i class="anticon anticon-folder-o"></i>
+		<span class="anticon-class">folder-o</span>
 	</li>
 	<li>
-		<i class="anticon anticon-folder-openo"></i>
-		<span class="anticon-class">folder-openo</span>
+		<i class="anticon anticon-folder-open-o"></i>
+		<span class="anticon-class">folder-open-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-github"></i>
 		<span class="anticon-class">github</span>
 	</li>
 	<li>
-		<i class="anticon anticon-hddo"></i>
-		<span class="anticon-class">hddo</span>
+		<i class="anticon anticon-hdd-o"></i>
+		<span class="anticon-class">hdd-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-frown"></i>
 		<span class="anticon-class">frown</span>
 	</li>
 	<li>
-		<i class="anticon anticon-meho"></i>
-		<span class="anticon-class">meho</span>
+		<i class="anticon anticon-meh-o"></i>
+		<span class="anticon-class">meh-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-inbox"></i>
@@ -417,8 +429,8 @@
 		<span class="anticon-class">paper-clip</span>
 	</li>
 	<li>
-		<i class="anticon anticon-pictureo"></i>
-		<span class="anticon-class">pictureo</span>
+		<i class="anticon anticon-picture-o"></i>
+		<span class="anticon-class">picture-o</span>
 	</li>
 	<li>
 		<i class="anticon anticon-pie-chart"></i>

style/core/iconfont.less

@@ -28,139 +28,139 @@
   }
 }
 // 方向性图标
-.@{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-round-right:before    {content:"\e60d";}
-.@{iconfont-css-prefix}-caret-round-left            {.ie-rotate(2);}
-.@{iconfont-css-prefix}-caret-round-left:before     {content:"\e60d";.rotate(180deg);}
-.@{iconfont-css-prefix}-caret-circle-right:before   {content:"\e60e";}
-.@{iconfont-css-prefix}-caret-circle-left           {.ie-rotate(2);}
-.@{iconfont-css-prefix}-caret-circle-left:before    {content:"\e60e";.rotate(180deg);}
-.@{iconfont-css-prefix}-round-right:before          {content:"\e602";}
-.@{iconfont-css-prefix}-round-left                  {.ie-rotate(2);}
-.@{iconfont-css-prefix}-round-left:before           {content:"\e602";.rotate(180deg);}
-.@{iconfont-css-prefix}-circle-right:before         {content:"\e603";}
-.@{iconfont-css-prefix}-circle-left                 {.ie-rotate(2);}
-.@{iconfont-css-prefix}-circle-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}-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                        {.ie-rotate(1);}
-.@{iconfont-css-prefix}-down:before                 {content:"\e611";.rotate(90deg);}
-.@{iconfont-css-prefix}-left                        {.ie-rotate(2);}
-.@{iconfont-css-prefix}-left:before                 {content:"\e611";.rotate(180deg);}
-.@{iconfont-css-prefix}-up                          {.ie-rotate(3);}
-.@{iconfont-css-prefix}-up:before                   {content:"\e611";.rotate(270deg);}
+.@{iconfont-css-prefix}-right:before                  {content:"\e611";}
+.@{iconfont-css-prefix}-down                          {.ie-rotate(1);}
+.@{iconfont-css-prefix}-down:before                   {content:"\e611";.rotate(90deg);}
+.@{iconfont-css-prefix}-left                          {.ie-rotate(2);}
+.@{iconfont-css-prefix}-left:before                   {content:"\e611";.rotate(180deg);}
+.@{iconfont-css-prefix}-up                            {.ie-rotate(3);}
+.@{iconfont-css-prefix}-up:before                     {content:"\e611";.rotate(270deg);}
 
 // 提示性图标
-.@{iconfont-css-prefix}-question:before             {content:"\e655";}
-.@{iconfont-css-prefix}-question-round:before       {content:"\e656";}
-.@{iconfont-css-prefix}-question-circle:before      {content:"\e657";}
-.@{iconfont-css-prefix}-plus:before                 {content:"\e651";}
-.@{iconfont-css-prefix}-plus-round:before           {content:"\e652";}
-.@{iconfont-css-prefix}-plus-circle:before          {content:"\e653";}
-.@{iconfont-css-prefix}-pause:before                {content:"\e64c";}
-.@{iconfont-css-prefix}-pause-round:before          {content:"\e64d";}
-.@{iconfont-css-prefix}-pause-circle:before         {content:"\e64e";}
-.@{iconfont-css-prefix}-minus:before                {content:"\e646";}
-.@{iconfont-css-prefix}-minus-round:before          {content:"\e647";}
-.@{iconfont-css-prefix}-minus-circle:before         {content:"\e648";}
-.@{iconfont-css-prefix}-info-round:before           {content:"\e637";}
-.@{iconfont-css-prefix}-info-circle:before          {content:"\e638";}
-.@{iconfont-css-prefix}-info:before                 {content:"\e63a";}
-.@{iconfont-css-prefix}-exclamation:before          {content:"\e627";}
-.@{iconfont-css-prefix}-exclamation-round:before    {content:"\e628";}
-.@{iconfont-css-prefix}-exclamation-circle:before   {content:"\e629";}
-.@{iconfont-css-prefix}-cross:before                {content:"\e61e";}
-.@{iconfont-css-prefix}-cross-round:before          {content:"\e61f";}
-.@{iconfont-css-prefix}-cross-circle:before         {content:"\e620";}
-.@{iconfont-css-prefix}-check:before                {content:"\e613";}
-.@{iconfont-css-prefix}-check-round:before          {content:"\e614";}
-.@{iconfont-css-prefix}-check-circle:before         {content:"\e615";}
-.@{iconfont-css-prefix}-clock-round:before          {content:"\e616";}
-.@{iconfont-css-prefix}-clock-circle:before         {content:"\e617";}
+.@{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}-booko: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}-fileo:before                {content:"\e62c";}
-.@{iconfont-css-prefix}-file-texto:before           {content:"\e62d";}
-.@{iconfont-css-prefix}-foldero:before              {content:"\e62e";}
-.@{iconfont-css-prefix}-folder-openo:before         {content:"\e62f";}
-.@{iconfont-css-prefix}-github:before               {content:"\e631";}
-.@{iconfont-css-prefix}-hddo:before                 {content:"\e632";}
-.@{iconfont-css-prefix}-frown:before                {content:"\e633";}
-.@{iconfont-css-prefix}-meho:before                 {content:"\e634";}
-.@{iconfont-css-prefix}-inbox:before                {content:"\e635";}
-.@{iconfont-css-prefix}-laptop:before               {content:"\e63d";}
-.@{iconfont-css-prefix}-large: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:before            {content:"\e644";}
-.@{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}-pictureo: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}-totop: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}-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-o: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-o:before                 {content:"\e62c";}
+.@{iconfont-css-prefix}-file-text-o:before            {content:"\e62d";}
+.@{iconfont-css-prefix}-folder-o:before               {content:"\e62e";}
+.@{iconfont-css-prefix}-folder-open-o:before          {content:"\e62f";}
+.@{iconfont-css-prefix}-github:before                 {content:"\e631";}
+.@{iconfont-css-prefix}-hdd-o:before                  {content:"\e632";}
+.@{iconfont-css-prefix}-frown:before                  {content:"\e633";}
+.@{iconfont-css-prefix}-meh-o:before                  {content:"\e634";}
+.@{iconfont-css-prefix}-inbox:before                  {content:"\e635";}
+.@{iconfont-css-prefix}-laptop:before                 {content:"\e63d";}
+.@{iconfont-css-prefix}-large: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:before              {content:"\e644";}
+.@{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-o: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}-totop: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}-loading:before {
   display: inline-block;
   .animation(loadingCircle @duration-1000 infinite linear);
@@ -176,10 +176,10 @@
   .@{iconfont-css-prefix}-caret-left,
   .@{iconfont-css-prefix}-caret-up,
   .@{iconfont-css-prefix}-caret-right,
-  .@{iconfont-css-prefix}-caret-round-left,
   .@{iconfont-css-prefix}-caret-circle-left,
-  .@{iconfont-css-prefix}-round-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 {

style/mixins/button.less

@@ -83,7 +83,7 @@
   cursor: pointer;
   background-image: none;
   border: 1px solid transparent;
-  outline: none;
+  // outline: none;
   white-space: nowrap;
   line-height: @line-height-base;
   .button-size(@btn-padding-base; @font-size-base; @btn-border-radius-base);