Merge 1.x-stable

.github/ISSUE_TEMPLATE.md

@@ -1,53 +1,25 @@
-If you want to ask a question, please read [some tips](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md#do-your-homework-before-asking-a-question) first :-)
+请按照下列格式报告问题，务必提供复现步骤，否则恕难解决，感谢您的支持。
-
-If you are going to report a bug, please answer the following questions, thank you!
-
-## What you did
-
-(e.g. I ate a hamburger)
-
-## What you would like to happen
-
-(e.g. I should be full)
-
-## What actually happened
-
-(e.g. But I am still hungry now T_T)
-
-## Online demo
-
-(e.g. http://codepen.io/anon/pen/wGOWGW?editors=001)
-
-## Environment Information
-
-- The version of antd(e.g. 0.12.0):
-- Your operating system and it's version(e.g. OSX 10.11.0):
-- Your browser and it's version(e.g. Chrome 48.0.0.0(64-bit)):
-
----
-
-提问之前，建议先阅读[这份提示](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md#do-your-homework-before-asking-a-question)。:-)
-
-如果是报告 bug，请按照下列格式编辑问题，务必提供复现步骤，否则恕难解决，非常感谢！
 
+```
 ## 你做了什么？
 
-（例如，我吃了一个汉堡）
+...
 
 ## 你期待的结果是：
 
-（例如，我应该饱了）
+...
 
-## 实际上的结果和抱怨：
+## 实际上的结果：
 
-（例如，我还是饿的，肯定是哪里出问题了）
+...
 
 ## 可重现的在线演示
 
-(e.g. http://codepen.io/anon/pen/wGOWGW?editors=001)
+(请修复并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)
 
 ## 本地环境信息
 
 - antd 版本:
 - 操作系统及其版本：
 - 浏览器及其版本:
+```

CHANGELOG.md

@@ -9,6 +9,12 @@ timeline: true
 
 ---
 
+## 1.6.1
+
+`2016-06-24`
+
+- 回滚一个未完成的 DatePicker 时间选项改造效果。
+
 ## 1.6.0
 
 `2016-06-24`

components/date-picker/style/Picker.less

@@ -40,7 +40,7 @@
   &-clear {
     opacity: 0;
     position: absolute;
-    right: 8px;
+    right: 7px;
     z-index: 1;
     background: #fff;
     top: 50%;

components/date-picker/style/RangePicker.less

@@ -57,13 +57,6 @@
     margin-left: -29px;
   }
 
-  .@{calendar-prefix-cls}-time-picker-wrap {
-    left: 115px;
-  }
-  &-right .@{calendar-prefix-cls}-time-picker-wrap {
-    left: 100px;
-  }
-
   &.@{calendar-prefix-cls}-time &-right .@{calendar-prefix-cls}-date-input-wrap {
     margin-left: -15px;
   }

components/date-picker/style/TimePicker.less

@@ -11,17 +11,14 @@
     .@{calendar-prefix-cls}-clear-btn {
       direction: ltr;
     }
-    .@{calendar-prefix-cls}-time-picker-wrap {
-      position: absolute;
-      right: 0;
-    }
   }
   .@{calendar-prefix-cls}-input,
   .@{timepicker-prefix-cls}-input {
-    // .input;
+    .input;
-  }
+    border-radius: @border-radius-sm;
-  .@{timepicker-prefix-cls}-input {
+    height: @input-height-sm;
-    display: none;
+    width: 96px;
+    margin-right: 6px;
   }
   .@{calendar-prefix-cls}-input {
     padding-right: 21px;
@@ -30,9 +27,6 @@
     min-width: 168px;
   }
   .@{timepicker-prefix-cls}-icon {
-    font-family: "anticon" !important;
+    display: none;
-    position: relative;
-    content: "\E643";
-    display: inline;
   }
 }

components/menu/style/index.less

@@ -34,6 +34,7 @@
   &-item,
   &-submenu,
   &-submenu-title {
+    transform: translateZ(0);
     cursor: pointer;
     transition: all 0.3s ease;
   }
@@ -48,12 +49,23 @@
     &:hover {
       color: @text-color;
     }
+    &:before {
+      position: absolute;
+      background-color: transparent;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+      content: '';
+    }
   }
 
+  &-item:hover,
   &-item-active,
   &-submenu-active,
   &-submenu-title:hover {
-    transform: translateZ(0);
     background-color: tint(@primary-color, 90%);
   }
 
@@ -62,10 +74,10 @@
     margin-top: -1px;
   }
 
+  &-horizontal > &-item:hover,
   &-horizontal > &-item-active,
   &-horizontal > &-submenu &-submenu-title:hover {
     background-color: transparent;
-    transform: translateZ(0);
   }
 
   &-item-selected {
@@ -221,6 +233,7 @@
       border-bottom: 2px solid transparent;
       z-index: 2;
 
+      &:hover,
       &-active,
       &-selected {
         border-bottom: 2px solid @primary-color;
@@ -234,17 +247,6 @@
         &:hover {
           color: @primary-color;
         }
-        &:before,
-        &:after {
-          position: absolute;
-          background-color: transparent;
-          width: 20px;
-          height: 100%;
-          content: '';
-        }
-        &:before {
-          left: 0;
-        }
       }
     }
 
@@ -325,6 +327,7 @@
     top: 0;
   }
 
+  &-dark&-horizontal > &-item:hover,
   &-dark&-horizontal > &-item-active,
   &-dark&-horizontal > &-item-selected,
   &-dark&-horizontal > &-submenu:hover,
@@ -359,7 +362,6 @@
     border-right: 0;
     background-color: @primary-color;
     color: #fff;
-    transform: translateZ(0);
     > a,
     > a:hover {
       color: #fff;
@@ -373,11 +375,11 @@
     }
   }
 
+  &-dark &-item:hover,
   &-dark &-item-active,
   &-dark &-submenu-active,
   &-dark &-submenu-title:hover {
     background-color: transparent;
     color: @primary-color;
-    transform: translateZ(0);
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",

site/theme/static/responsive.less

@@ -54,14 +54,19 @@
     overflow-x: hidden;
     overflow-y: auto;
     opacity: 0;
+    transition: transform .3s, opacity .3s;
+    text-align: center;
+
+    #lang {
+      margin: 0;
+      float: none;
+      color: #666;
+    }
   }
 
   .nav.nav-show {
-    animation: moveLeft .2s ease-in forwards;
+    transform: translateX(0);
-  }
+    opacity: 1;
-
-  .nav.nav-hide {
-    animation: moveLeftOut .2s ease-in forwards;
   }
 
   ul#nav,
@@ -73,6 +78,7 @@
   ul#nav li {
     line-height: 60px;
     height: 60px;
+    padding: 0 !important;
     a {
       color: #333;
     }
@@ -141,25 +147,3 @@
     width: auto;
   }
 }
-
-@keyframes moveLeft {
-  0% {
-    transform: translateX(-100%);
-    opacity: 0;
-  }
-  100% {
-    transform: translateX(0px);
-    opacity: 1;
-  }
-}
-
-@keyframes moveLeftOut {
-  0% {
-    transform: translateX(0px);
-    opacity: 1;
-  }
-  100% {
-    transform: translateX(-100%);
-    opacity: 0;
-  }
-}

site/theme/template/Layout/Header.jsx

@@ -26,7 +26,10 @@ export default class Header extends React.Component {
       }
     }, 100);
 
-    this.onDocumentClick = () => {
+    this.onDocumentClick = (e) => {
+      if (document.querySelector('#header .nav').contains(e.target)) {
+        return;
+      }
       this.setState({
         menuVisible: false,
       });
@@ -43,6 +46,7 @@ export default class Header extends React.Component {
     window.addEventListener('scroll', this.onScroll);
 
     document.addEventListener('click', this.onDocumentClick);
+    document.addEventListener('touchstart', this.onDocumentClick);
 
     enquire.register('only screen and (min-width: 320px) and (max-width: 767px)', {
       match: () => {
@@ -57,6 +61,7 @@ export default class Header extends React.Component {
   componentWillUnmount() {
     window.removeEventListener('scroll', this.onScroll);
     document.removeEventListener('click', this.onDocumentClick);
+    document.removeEventListener('touchstart', this.onDocumentClick);
   }
 
   handleMenuIconClick = (e) => {
@@ -103,10 +108,6 @@ export default class Header extends React.Component {
         );
       });
 
-    const menuStyle = {
-      display: this.state.menuVisible ? 'block' : '',
-    };
-
     const headerClassName = classNames({
       clearfix: true,
       'home-nav-white': !this.state.isFirstFrame,
@@ -126,8 +127,8 @@ export default class Header extends React.Component {
               <span>Ant Design</span>
             </Link>
           </Col>
-          <Col className={`nav ${this.state.menuVisible ? 'nav-show' : 'nav-hide'}`}
+          <Col className={`nav ${this.state.menuVisible ? 'nav-show' : ''}`}
-            lg={20} md={18} sm={17} xs={0} style={menuStyle}
+            lg={20} md={18} sm={17} xs={0} style={{ display: 'block' }}
           >
             <div id="search-box">
               <Select combobox