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

components/dropdown/demo/basic.md

@@ -29,3 +29,9 @@ React.render(
   </Dropdown>
 , document.getElementById('components-dropdown-demo-basic'));
 ````
+
+<style>
+.code-box-demo .ant-btn {
+  margin-right: 6px;
+}
+</style>

components/iconfont/index.md

@@ -544,7 +544,7 @@ $(function() {
   $('.anticons-list li').each(function(i, item) {
     var client = new ZeroClipboard(item);
     client.on( "copy", function (event) {
-      client.setText('<i className="anticon anticon-' + $(item).find('.anticon-class').html() + '></i>');
+      client.setText('<i className="anticon anticon-' + $(item).find('.anticon-class').html() + '"></i>');
     });
     client.on( "ready", function( readyEvent ) {
       client.on( "aftercopy", function( event ) {

site/templates/layout.html

@@ -10,10 +10,10 @@
   <link rel="icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
   <link rel="shortcut icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
   <link rel="stylesheet" href="/static/normalize.css">
+  {% block styles %}{% endblock %}
   <link rel="stylesheet" href="/static/style.css">
   <link href="http://fonts.useso.com/css?family=Raleway:600,500,400,300" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="/static/tomorrow.css">
-  {% block styles %}{% endblock %}
   <script src="https://a.alipayobjects.com/jquery/jquery/1.11.1/jquery.js"></script>
   <!-- react -->
   <script src="https://a.alipayobjects.com/react/0.13.2/react.js"></script>