Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
5042c2d7
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5042c2d7
编写于
7月 20, 2015
作者:
S
SimaQ
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/ant-design/ant-design
上级
745b6d3b
b90f83ed
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
14 addition
and
447 deletion
+14
-447
components/input-number/demo/basic.md
components/input-number/demo/basic.md
+1
-1
components/input-number/demo/disabled.md
components/input-number/demo/disabled.md
+4
-4
components/input-number/index.jsx
components/input-number/index.jsx
+1
-1
components/motion/demo/basic.md
components/motion/demo/basic.md
+1
-4
components/motion/index.md
components/motion/index.md
+1
-0
site/templates/layout.html
site/templates/layout.html
+4
-7
static/normalize.css
static/normalize.css
+0
-427
static/style.css
static/style.css
+1
-1
style/components/inputNumber.less
style/components/inputNumber.less
+1
-2
未找到文件。
components/input-number/demo/basic.md
浏览文件 @
5042c2d7
...
...
@@ -14,7 +14,7 @@ function onChange(value) {
}
React
.
render
(
<
InputNumber
min
=
{
1
}
max
=
{
10
}
defaultValue
=
{
3
}
onChange
=
{
onChange
}
style
=
{
{
width
:
100
}
}
/>
<
InputNumber
min
=
{
1
}
max
=
{
10
}
defaultValue
=
{
3
}
onChange
=
{
onChange
}
/>
,
document
.
getElementById
(
'
components-input-number-demo-basic
'
));
````
components/input-number/demo/disabled.md
浏览文件 @
5042c2d7
...
...
@@ -22,10 +22,10 @@ var Test = React.createClass({
},
render
()
{
return
<
div
>
<
InputNumber
min
=
{
1
}
max
=
{
10
}
disabled
=
{
this
.
state
.
disabled
}
defaultValue
=
{
3
}
style
=
{
{
width
:
100
}
}
/>
<
br
/
>
<
br
/
>
<
button
onClick
=
{
this
.
toggle
}
className
=
"ant-btn ant-btn-primary"
>
Toggle disabled
</
button
>
<
InputNumber
min
=
{
1
}
max
=
{
10
}
disabled
=
{
this
.
state
.
disabled
}
defaultValue
=
{
3
}
/>
<
div
style
=
{
{
marginTop
:
20
}
}
>
<
button
onClick
=
{
this
.
toggle
}
className
=
"ant-btn ant-btn-primary"
>
Toggle disabled
</
button
>
<
/
div
>
</
div
>;
}
});
...
...
components/input-number/index.jsx
浏览文件 @
5042c2d7
...
...
@@ -8,7 +8,7 @@ var AntInputNumber = React.createClass({
};
},
render
()
{
return
<
InputNumber
{
...
this
.
props
}
/>;
return
<
InputNumber
style
=
{
{
width
:
90
}
}
{
...
this
.
props
}
/>;
}
});
...
...
components/motion/demo/basic.md
浏览文件 @
5042c2d7
...
...
@@ -220,7 +220,4 @@ React.render(<Test/>, document.getElementById('components-motion-demo-basic'));
.motion-select {
text-align: center;
}
.code-boxes-col-2-1 {
width:100%;
}
</style>
\ No newline at end of file
</style>
components/motion/index.md
浏览文件 @
5042c2d7
...
...
@@ -3,6 +3,7 @@
-
category: CSS
-
chinese: 组件动画
-
order: 4
-
cols: 1
---
...
...
site/templates/layout.html
浏览文件 @
5042c2d7
...
...
@@ -11,10 +11,8 @@
<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
href=
"http://fonts.useso.com/css?family=Raleway:600,500,400,300"
rel=
"stylesheet"
type=
"text/css"
>
<link
rel=
"stylesheet"
href=
"/static/normalize.css"
>
{% block styles %}{% endblock %}
<link
rel=
"stylesheet"
href=
"/dist/{{ config.package.name }}-{{ config.package.version }}.css"
>
<link
rel=
"stylesheet"
href=
"/static/style.css"
>
<link
rel=
"stylesheet"
href=
"/static/tomorrow.css"
>
<script>
...
...
@@ -85,12 +83,11 @@
<body
{%
block
bodyAttribute
%}{%
endblock
%}
>
<header
id=
"header"
>
<a
class=
"logo"
href=
"/"
>
<img
width=
"60"
src=
"https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg"
>
{{ config.site.name }}
<img
width=
"60"
src=
"https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg"
>
{{ config.site.name }}
</a>
<div
class=
"search"
>
<form>
<div
id=
"autoComplete"
></div>
</form>
<div
class=
"search"
>
<div
id=
"autoComplete"
></div>
</div>
<nav
class=
"nav"
>
<span
class=
"bar"
></span>
...
...
static/normalize.css
已删除
100644 → 0
浏览文件 @
745b6d3b
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html
{
font-family
:
sans-serif
;
/* 1 */
-ms-text-size-adjust
:
100%
;
/* 2 */
-webkit-text-size-adjust
:
100%
;
/* 2 */
}
/**
* Remove default margin.
*/
body
{
margin
:
0
;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
hgroup
,
main
,
menu
,
nav
,
section
,
summary
{
display
:
block
;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio
,
canvas
,
progress
,
video
{
display
:
inline-block
;
/* 1 */
vertical-align
:
baseline
;
/* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio
:not
([
controls
])
{
display
:
none
;
height
:
0
;
}
/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
*/
[
hidden
],
template
{
display
:
none
;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a
{
background-color
:
transparent
;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a
:active
,
a
:hover
{
outline
:
0
;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr
[
title
]
{
border-bottom
:
1px
dotted
;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b
,
strong
{
font-weight
:
bold
;
}
/**
* Address styling not present in Safari and Chrome.
*/
dfn
{
font-style
:
italic
;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1
{
font-size
:
2em
;
margin
:
0.67em
0
;
}
/**
* Address styling not present in IE 8/9.
*/
mark
{
background
:
#ff0
;
color
:
#000
;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small
{
font-size
:
80%
;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub
,
sup
{
font-size
:
75%
;
line-height
:
0
;
position
:
relative
;
vertical-align
:
baseline
;
}
sup
{
top
:
-0.5em
;
}
sub
{
bottom
:
-0.25em
;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9/10.
*/
img
{
border
:
0
;
}
/**
* Correct overflow not hidden in IE 9/10/11.
*/
svg
:not
(
:root
)
{
overflow
:
hidden
;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari.
*/
figure
{
margin
:
1em
40px
;
}
/**
* Address differences between Firefox and other browsers.
*/
hr
{
-moz-box-sizing
:
content-box
;
box-sizing
:
content-box
;
height
:
0
;
}
/**
* Contain overflow in all browsers.
*/
pre
{
overflow
:
auto
;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code
,
kbd
,
pre
,
samp
{
font-family
:
monospace
,
monospace
;
font-size
:
1em
;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button
,
input
,
optgroup
,
select
,
textarea
{
color
:
inherit
;
/* 1 */
font
:
inherit
;
/* 2 */
margin
:
0
;
/* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button
{
overflow
:
visible
;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
button
,
select
{
text-transform
:
none
;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button
,
html
input
[
type
=
"button"
],
/* 1 */
input
[
type
=
"reset"
],
input
[
type
=
"submit"
]
{
-webkit-appearance
:
button
;
/* 2 */
cursor
:
pointer
;
/* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button
[
disabled
],
html
input
[
disabled
]
{
cursor
:
default
;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button
::-moz-focus-inner
,
input
::-moz-focus-inner
{
border
:
0
;
padding
:
0
;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input
{
line-height
:
normal
;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input
[
type
=
"checkbox"
],
input
[
type
=
"radio"
]
{
box-sizing
:
border-box
;
/* 1 */
padding
:
0
;
/* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input
[
type
=
"number"
]
::-webkit-inner-spin-button
,
input
[
type
=
"number"
]
::-webkit-outer-spin-button
{
height
:
auto
;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
*/
input
[
type
=
"search"
]
{
-webkit-appearance
:
textfield
;
/* 1 */
-moz-box-sizing
:
content-box
;
-webkit-box-sizing
:
content-box
;
/* 2 */
box-sizing
:
content-box
;
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input
[
type
=
"search"
]
::-webkit-search-cancel-button
,
input
[
type
=
"search"
]
::-webkit-search-decoration
{
-webkit-appearance
:
none
;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset
{
border
:
1px
solid
#c0c0c0
;
margin
:
0
2px
;
padding
:
0.35em
0.625em
0.75em
;
}
/**
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend
{
border
:
0
;
/* 1 */
padding
:
0
;
/* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea
{
overflow
:
auto
;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup
{
font-weight
:
bold
;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table
{
border-collapse
:
collapse
;
border-spacing
:
0
;
}
td
,
th
{
padding
:
0
;
}
static/style.css
浏览文件 @
5042c2d7
...
...
@@ -1647,7 +1647,7 @@ footer ul li > a {
}
.code-boxes-col-1-1
{
width
:
75
%
;
width
:
80
%
;
}
.code-boxes-col-2-1
{
...
...
style/components/inputNumber.less
浏览文件 @
5042c2d7
...
...
@@ -22,7 +22,7 @@
height: 14px;
overflow: hidden;
color: #999;
&:hover &-up-inner,
&:hover &-up-inner,
&:hover &-down-inner {
color: tint(@primary-color, 20%);
}
...
...
@@ -100,7 +100,6 @@
&-handler-down {
cursor: pointer;
&-inner {
bottom: 1px;
&:before {
content: "\e600";
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录