Merge branch '1.x-stable'

9 years ago · ef4c1a4749
10 changed files with 133 additions and 112 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -15,7 +15,7 @@

 ## 可重现的在线演示

-(请修复并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)
+(请修改并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)

 ## 本地环境信息

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,6 +9,14 @@ timeline: true

 ---

+## 1.6.2
+
+`2016-06-27`
+
+- 修复 Table、Transfer 的样式错位问题。
+- 修复 DatePicker 的一个样式问题。[#2182](https://github.com/ant-design/ant-design/issues/2182)
+- 优化 Menu 的 hover 样式响应性能。
+
 ## 1.6.1

 `2016-06-24`
--- a/components/checkbox/style/mixin.less
+++ b/components/checkbox/style/mixin.less
@ -161,9 +161,10 @@
  .@{checkbox-prefix-cls}-wrapper {
    cursor: pointer;
    font-size: @font-size-base;
-    margin-bottom: 8px;
-    margin-right: 8px;
    display: inline-block;
+    & + & {
+      margin-left: 8px;
+    }
  }

  .@{checkbox-prefix-cls}-wrapper + span,
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@ -161,6 +161,11 @@ form {
    display: block;
  }

+  .ant-checkbox-vertical + .ant-checkbox-vertical,
+  .ant-radio-vertical + .ant-radio-vertical {
+    margin-left: 0;
+  }
+
  .ant-input-number {
    margin-top: -1px;
    margin-right: 8px;
--- a/components/modal/style/modal.less
+++ b/components/modal/style/modal.less
@ -102,7 +102,7 @@

  &.zoom-enter,
  &.zoom-appear {
-    animation-duration: .2s;
+    animation-duration: .3s;
    transform: none; // reset scale avoid mousePosition bug
    opacity: 0;
  }
--- a/components/radio/radio.tsx
+++ b/components/radio/radio.tsx
@ -12,15 +12,20 @@ export default class Radio extends React.Component {
  }
  render() {
    const { prefixCls, children, checked, disabled, className, style } = this.props;
+    const wrapperClassString = classNames({
+      [`${prefixCls}-wrapper`]: true,
+      [`${prefixCls}-wrapper-checked`]: checked,
+      [`${prefixCls}-wrapper-disabled`]: disabled,
+      [className]: !!className,
+    });
    const classString = classNames({
      [`${prefixCls}`]: true,
      [`${prefixCls}-checked`]: checked,
      [`${prefixCls}-disabled`]: disabled,
-      [className]: !!className,
    });
    return (
-      <label className={classString} style={style}>
-        <RcRadio {...this.props} style={null} children={null} />
+      <label className={wrapperClassString} style={style}>
+        <RcRadio {...this.props} className={classString} style={null} children={null} />
        {children ? <span>{children}</span> : null}
      </label>
    );
--- a/components/radio/style/index.less
+++ b/components/radio/style/index.less
@ -9,14 +9,19 @@
 .@{radio-group-prefix-cls} {
  display: inline-block;
  font-size: @font-size-base;
-  label {
-    margin-right: 16px;
-  }
 }

 // 一般状态
-.@{radio-prefix-cls} {
+.@{radio-prefix-cls}-wrapper {
  font-size: @font-size-base;
+  vertical-align: middle;
+  display: inline-block;
+  position: relative;
+  white-space: nowrap;
+  margin-right: 8px;
+}
+
+.@{radio-prefix-cls} {
  white-space: nowrap;
  outline: none;
  display: inline-block;
@ -24,9 +29,6 @@
  line-height: 1;
  vertical-align: middle;
  cursor: pointer;
-  label& {
-    margin-right: 8px;
-  }
  &:hover,
  &-focused {
    .@{radio-inner-prefix-cls} {
@ -118,119 +120,117 @@ span.@{radio-prefix-cls} + * {
  margin-right: 8px;
 }

-.@{radio-prefix-cls} {
-  label&-button {
-    background: #fff;
-    padding: 0 16px;
-    margin: 0;
-    height: 28px;
-    line-height: 26px;
-    color: #666;
-    display: inline-block;
-    transition: all 0.3s ease;
-    cursor: pointer;
-    border: 1px solid @border-color-base;
-    border-left: 0;
-
-    a {
-      color: #666;
-    }
+.@{radio-prefix-cls}-button-wrapper {
+  margin: 0;
+  height: 28px;
+  line-height: 26px;
+  color: #666;
+  display: inline-block;
+  transition: all 0.3s ease;
+  cursor: pointer;
+  border: 1px solid @border-color-base;
+  border-left: 0;
+  background: #fff;
+  padding: 0 16px;

-    > span.@{radio-prefix-cls}-button {
-      margin-left: 0;
-      display: block;
-      width: 0;
-      height: 0;
-    }
+  a {
+    color: #666;
+  }

-    .@{radio-group-prefix-cls}-large & {
-      height: 32px;
-      line-height: 30px;
-    }
+  > .@{radio-prefix-cls}-button {
+    margin-left: 0;
+    display: block;
+    width: 0;
+    height: 0;
+  }

-    .@{radio-group-prefix-cls}-small & {
-      height: 22px;
-      line-height: 20px;
-      padding: 0 12px;
-      &:first-child {
-        border-radius: @border-radius-sm 0 0 @border-radius-sm;
-      }
-      &:last-child {
-        border-radius: 0 @border-radius-sm @border-radius-sm 0;
-      }
-    }
+  .@{radio-group-prefix-cls}-large & {
+    height: 32px;
+    line-height: 30px;
+  }

+  .@{radio-group-prefix-cls}-small & {
+    height: 22px;
+    line-height: 20px;
+    padding: 0 12px;
    &:first-child {
-      border-radius: @border-radius-base 0 0 @border-radius-base;
-      border-left: 1px solid @border-color-base;
+      border-radius: @border-radius-sm 0 0 @border-radius-sm;
    }
-
    &:last-child {
-      border-radius: 0 @border-radius-base @border-radius-base 0;
+      border-radius: 0 @border-radius-sm @border-radius-sm 0;
    }
+  }

-    &:first-child:last-child {
-      border-radius: @border-radius-base;
-    }
+  &:first-child {
+    border-radius: @border-radius-base 0 0 @border-radius-base;
+    border-left: 1px solid @border-color-base;
+  }
+
+  &:last-child {
+    border-radius: 0 @border-radius-base @border-radius-base 0;
+  }
+
+  &:first-child:last-child {
+    border-radius: @border-radius-base;
+  }
+
+  &:hover,
+  &-focused {
+    color: @primary-color;
+    position: relative;
+  }
+
+  .@{radio-prefix-cls}-inner,
+  input {
+    .opacity(0);
+    width: 0;
+    height: 0;
+  }
+
+  &-checked {
+    background: #fff;
+    border-color: @primary-color;
+    color: @primary-color;
+    box-shadow: -1px 0 0 0 @primary-color;

-    &:hover,
-    &-focused {
-      color: @primary-color;
-      position: relative;
+    &:first-child {
+      border-color: @primary-color;
+      box-shadow: none!important;
    }

-    .@{radio-prefix-cls}-inner,
-    input {
-      .opacity(0);
-      width: 0;
-      height: 0;
+    &:hover {
+      border-color: tint(@primary-color, 20%);
+      box-shadow: -1px 0 0 0 tint(@primary-color, 20%);
+      color: tint(@primary-color, 20%);
    }

-    &-checked {
-      background: #fff;
-      border-color: @primary-color;
-      color: @primary-color;
-      box-shadow: -1px 0 0 0 @primary-color;
-
-      &:first-child {
-        border-color: @primary-color;
-        box-shadow: none!important;
-      }
-
-      &:hover {
-        border-color: tint(@primary-color, 20%);
-        box-shadow: -1px 0 0 0 tint(@primary-color, 20%);
-        color: tint(@primary-color, 20%);
-      }
-
-      &:active {
-        border-color: shade(@primary-color, 5%);
-        box-shadow: -1px 0 0 0 shade(@primary-color, 5%);
-        color: shade(@primary-color, 5%);
-      }
+    &:active {
+      border-color: shade(@primary-color, 5%);
+      box-shadow: -1px 0 0 0 shade(@primary-color, 5%);
+      color: shade(@primary-color, 5%);
    }
+  }
+
+  &-disabled {
+    border-color: @border-color-base;
+    background-color: #f7f7f7;
+    cursor: not-allowed;
+    color: #ccc;

-    &-disabled {
+    &:first-child,
+    &:hover {
      border-color: @border-color-base;
      background-color: #f7f7f7;
-      cursor: not-allowed;
      color: #ccc;
-
-      &:first-child,
-      &:hover {
-        border-color: @border-color-base;
-        background-color: #f7f7f7;
-        color: #ccc;
-      }
-      &:first-child {
-        border-left-color: @border-color-base;
-      }
    }
-
-    &-disabled.@{radio-prefix-cls}-button-checked {
-      color: #fff;
-      background-color: #e6e6e6;
-      border-color: @border-color-base;
+    &:first-child {
+      border-left-color: @border-color-base;
    }
  }
+
+  &-disabled&-checked {
+    color: #fff;
+    background-color: #e6e6e6;
+    border-color: @border-color-base;
+  }
 }
--- a/components/style/core/motion/zoom.less
+++ b/components/style/core/motion/zoom.less
@ -10,7 +10,9 @@
  }
 }

+// For Modal
 .zoom-motion(zoom, antZoom);
+// For Tooltip、Popover、Popconfirm、Dropdown
 .zoom-motion(zoom-big, antZoomBig);
 .zoom-motion(zoom-up, antZoomUp);
 .zoom-motion(zoom-down, antZoomDown);
@ -20,7 +22,7 @@
@keyframes antZoomIn {
  0% {
    opacity: 0;
-    transform: scale(0);
+    transform: scale(0.2);
  }
  100% {
    opacity: 1;
@ -34,7 +36,7 @@
  }
  100% {
    opacity: 0;
-    transform: scale(0);
+    transform: scale(0.2);
  }
 }

--- a/components/transfer/demo/custom-item.md
+++ b/components/transfer/demo/custom-item.md
@ -41,8 +41,8 @@ const App = React.createClass({
  },
  renderItem(item) {
    const customLabel = (
-      <div className="custom-item" style={{ color: '#5FBC29' }}>
-        <Icon type="apple" /> {item.title} - {item.description} <Icon type="android" />
+      <div className="custom-item">
+        {item.title} - {item.description} <Icon type="android" />
      </div>
    );

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