test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-11-30 02:59:04 +08:00
Code Issues Actions 68 Packages Projects Releases Wiki Activity

Merge branch '1.x-stable'

Browse Source
This commit is contained in:
afc163 2016-06-27 17:58:16 +08:00
commit ef4c1a4749
10 changed files with 146 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View File

@ -15,7 +15,7 @@
## 可重现的在线演示
(请修复并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)
(请修改并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001)
## 本地环境信息

8
CHANGELOG.md
View File

@ -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`

5
components/checkbox/style/mixin.less
View File

@ -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,

5
components/form/style/index.less
View File

@ -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;

2
components/modal/style/modal.less
View File

@ -102,7 +102,7 @@
&.zoom-enter,
&.zoom-appear {
animation-duration: .2s;
animation-duration: .3s;
transform: none; // reset scale avoid mousePosition bug
opacity: 0;
}

11
components/radio/radio.tsx
View File

@ -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>
);

226
components/radio/style/index.less
View File

@ -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;
.@{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;
a {
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 {
margin-left: 0;
display: block;
width: 0;
height: 0;
}
> span.@{radio-prefix-cls}-button {
margin-left: 0;
display: block;
width: 0;
height: 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-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;
}
&: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;
&: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%);
}
}
&-disabled {
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;
border-radius: 0 @border-radius-sm @border-radius-sm 0;
}
}
&: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;
&: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%);
}
}
&-disabled {
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&-checked {
color: #fff;
background-color: #e6e6e6;
border-color: @border-color-base;
}
}

6
components/style/core/motion/zoom.less
View File

@ -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);
}
}

4
components/transfer/demo/custom-item.md
View File

@ -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>
);

2
package.json
View File

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