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

components/layout/demo/flex.md

@@ -17,8 +17,6 @@ Flex 布局基础
   <div class="col-4">2</div>
 </div>
 
-<hr />
-
 <p>子元素居中排列</p>
 <div class="row-flex row-flex-center">
   <div class="col-4">2</div>

components/layout/index.md

@@ -8,6 +8,8 @@
 
 ## 设计理念
 
+24 栅格系统。
+
 <div class="row demo-row" >
   <div class="col-24 demo-col demo-col-1">
     100%
@@ -130,4 +132,4 @@
 .hight-80 {
 	height: 80px;
 }
-</style>
\ No newline at end of file
+</style>

components/tooltip/index.jsx

@@ -11,7 +11,7 @@ module.exports = React.createClass({
     return  (
       <Tooltip placement={this.props.placement}
         prefixCls="ant-tooltip"
-        trigger="hover"
+        trigger="click"
         overlay={this.props.title}>
         {this.props.children}
       </Tooltip>

site/templates/component-aside.html

@@ -5,7 +5,7 @@
   {%- set items = resource.pages|find_category(category) %}
     <li>
       <h4>{{category}}</h4>
-      <ul >
+      <ul class="{%- if category === post.meta.category %}aside-list-show{%- endif %}">
         {%- for item in items %}
         <li class="{%- if item.title === post.title %}current{%- endif %}">
           <a href="{{permalink_url(item)}}">

static/style.css

@@ -117,7 +117,6 @@ header {
   overflow: hidden;
   border-bottom: 1px solid #eee;
   font-size: 16px;
-
 }
 
 .fn-hide {
@@ -456,16 +455,16 @@ footer ul li > a {
   cursor: pointer;
   transition: background .5s, border .5s;
   border-left: 3px solid transparent;
-    position: relative;
-    z-index: 1;
-    background: #F9F9F9;
+  position: relative;
+  z-index: 1;
+  background: #F9F9F9;
 }
 
 .aside-container li>ul {
   display: none;
 }
 
-.aside-container li>ul.show {
+.aside-container li>ul.aside-list-show {
   display: block;
 }
 
@@ -1722,6 +1721,7 @@ footer ul li > a {
 .code-box-meta > p {
   font-size: 12px;
   margin: 0.5em 0;
+  padding-right: 25px;
 }
 
 .code-box .collapse {

style/components/tooltip.less

@@ -11,11 +11,13 @@
 @tooltip-color:               #fff;
 //** Tooltip background color
 @tooltip-bg:                  #373737;
-@tooltip-opacity:             1;
+@tooltip-opacity:             0.9;
 
 //** Tooltip arrow width
 @tooltip-arrow-width:         5px;
 //** Tooltip arrow color
+@tooltip-distance:            @tooltip-arrow-width+4;
+//** Tooltip arrow color
 @tooltip-arrow-color:         @tooltip-bg;
 
 // Base class
@@ -28,17 +30,18 @@
   top: -9999px;
   font-size: @font-size-base;
   line-height: @line-height-base;
+  opacity: @tooltip-opacity;
 
-  &-placement-top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }
-  &-placement-right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }
-  &-placement-bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }
-  &-placement-left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }
+  &-placement-top    { padding: @tooltip-arrow-width 0 @tooltip-distance 0; }
+  &-placement-right  { padding: 0 @tooltip-arrow-width 0 @tooltip-distance; }
+  &-placement-bottom { padding: @tooltip-distance 0 @tooltip-arrow-width 0; }
+  &-placement-left   { padding: 0 @tooltip-distance 0 @tooltip-arrow-width; }
 }
 
 // Wrapper for the tooltip content
 .@{tooltipPrefixClass}-inner {
   max-width: @tooltip-max-width;
-  padding: 7px 10px;
+  padding: 8px 10px;
   color: @tooltip-color;
   text-align: left;
   text-decoration: none;
@@ -58,7 +61,7 @@
 
 .@{tooltipPrefixClass} {
   &-placement-top &-arrow {
-    bottom: 0;
+    bottom: @tooltip-distance - @tooltip-arrow-width;
     left: 50%;
     margin-left: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
@@ -66,20 +69,20 @@
   }
   &-placement-right &-arrow {
     top: 50%;
-    left: 0;
+    left:  @tooltip-distance - @tooltip-arrow-width;
     margin-top: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;
     border-right-color: @tooltip-arrow-color;
   }
   &-placement-left &-arrow {
     top: 50%;
-    right: 0;
+    right: @tooltip-distance - @tooltip-arrow-width;
     margin-top: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;
     border-left-color: @tooltip-arrow-color;
   }
   &-placement-bottom &-arrow {
-    top: 0;
+    top: @tooltip-distance - @tooltip-arrow-width;
     left: 50%;
     margin-left: -@tooltip-arrow-width;
     border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;

style/core/base.less

@@ -79,10 +79,6 @@ a {
 .invisible {
   visibility: hidden;
 }
-.hidden {
-  display: none !important;
-  visibility: hidden !important;
-}
 .affix {
   position: fixed;
 }
\ No newline at end of file