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

components/iconfont/index.md

@@ -25,7 +25,7 @@
 使用时所有的图标都需要一个基类 `.anticon` 和对应每个图标的类。在这里，我们使用 `<i>` 标签，如下面代码演示使用即可。
 
 ```html
-<i class="anticon anticon-link"></i>
+<i className="anticon anticon-link"></i>
 ```
 
 > 点击图标复制代码。

spec/font.md

@@ -23,12 +23,6 @@
 font-family: "Helvetica Neue",Helvetica,"Hiragino Sans GB","STHeitiSC-Light","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 ```
 
-代码字体：
-
-```css
-font-family: "PT Mono",Menlo,Consolas,"Courier New",monospace;
-```
-
 ## 字体使用规范
 
 <div class="row">

static/style.css

@@ -424,8 +424,8 @@ footer ul li > a {
 }
 
 .aside-container li a {
-  line-height: 38px;
-  height: 38px;
+  line-height: 40px;
+  height: 40px;
   display: block;
   padding-left: 60px;
   font-size: 14px;

style/core/base.less

@@ -98,3 +98,10 @@ a {
 .invisible {
   visibility: hidden;
 }
+
+code,
+kbd,
+pre,
+samp {
+  font-family: @code-family;
+}

style/themes/default/custom.less

@@ -11,7 +11,7 @@
 @body-background        : #fff;
 
 @font-family            : "Helvetica Neue",Helvetica,"Hiragino Sans GB","STHeitiSC-Light","Microsoft YaHei","微软雅黑",Arial,sans-serif;
-@code-family            : "PT Mono",Menlo,Consolas,"Courier New",monospace;
+@code-family            : Consolas,Menlo,Courier,monospace;
 @text-color             : #666;
 @font-size-base         : 12px;
 @line-height-base       : 1.5;