Merge branch 'master' into develop-0.12.0

This commit is contained in:
afc163 2016-01-26 13:44:31 +08:00
commit cf077230d7
5 changed files with 17 additions and 4 deletions

View File

@ -102,7 +102,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。
<style>
.code-line-highlight {
box-shadow: 0px 196px 0px rgba(255, 207, 0, 0.16);
box-shadow: 0px 190px 0px rgba(255, 207, 0, 0.16);
height: 42px;
margin-top: -42px;
position: relative;
@ -136,7 +136,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。
### 改变主色系
- [配置代码示例](https://github.com/ant-tool/xtool/tree/master/examples/customize-antd-theme)
- [配置代码示例](https://github.com/ant-design/antd-init/tree/master/examples/customize-antd-theme)
## 小甜点

View File

@ -1,6 +1,6 @@
require('../style/index.less');
require('../site/static/style.css');
require('../site/static/tomorrow.css');
require('../site/static/style.less');
require('../site/static/tomorrow.less');
window['css-animation'] = require('css-animation');
window['react-router'] = require('react-router');

View File

@ -81,6 +81,19 @@
{% block aside %}{% endblock %} {% block content %}{% endblock %}
</div>
{%- include "footer.html" %}
<script data-no-instant>
if (!location.port) {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-72788897-1', 'auto');
ga('send', 'pageview');
InstantClick.on('change', function() {
ga('send', 'pageview', location.pathname + location.search);
});
}
</script>
<script data-no-instant>
InstantClick.on('change', function() {
InstantClickChangeFns.forEach(function(fn) {