Skip to content

Commit 1faddae

Browse files
warmhugwarmhug
committedApr 22, 2016
up button
·
1.0.0-alpha.50.7.0
1 parent 6e2e53c commit 1faddae

File tree

6 files changed

+32
-38
lines changed

6 files changed

+32
-38
lines changed
 

‎components/button/index.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ export default class Button extends React.Component {
3939
}
4040
static defaultProps = {
4141
prefixCls: 'am-button',
42-
type: '',
4342
size: 'large',
4443
ghost: false,
4544
inline: false,
4645
disabled: false,
4746
loading: false,
4847
onClick: noop,
49-
htmlType: 'button',
5048
}
5149

5250
onClick = () => {

‎components/flex/demo/align.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ let FlexExample = React.createClass({
2121
<Button>3列</Button>
2222
</Flex.Item>
2323
<Flex.Item>
24-
<Button mode="white" size="small">3列</Button>
24+
<Button type="primary">3列</Button>
2525
</Flex.Item>
2626
<Flex.Item>
27-
<Button size="tiny">3列</Button>
27+
<Button size="small">3列</Button>
2828
</Flex.Item>
2929
</Flex>
3030
</WingBlank>
@@ -36,10 +36,10 @@ let FlexExample = React.createClass({
3636
<Button>3列</Button>
3737
</Flex.Item>
3838
<Flex.Item>
39-
<Button mode="white" size="small">3列</Button>
39+
<Button type="primary">3列</Button>
4040
</Flex.Item>
4141
<Flex.Item>
42-
<Button size="tiny">3列</Button>
42+
<Button size="small">3列</Button>
4343
</Flex.Item>
4444
</Flex>
4545
</WingBlank>
@@ -51,10 +51,10 @@ let FlexExample = React.createClass({
5151
<Button>3列</Button>
5252
</Flex.Item>
5353
<Flex.Item>
54-
<Button mode="white" size="small">3列</Button>
54+
<Button type="primary">3列</Button>
5555
</Flex.Item>
5656
<Flex.Item>
57-
<Button size="tiny">3列</Button>
57+
<Button size="small">3列</Button>
5858
</Flex.Item>
5959
</Flex>
6060
</WingBlank>

‎components/flex/demo/basic.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let FlexExample = React.createClass({
2020
<Button>2列</Button>
2121
</Flex.Item>
2222
<Flex.Item>
23-
<Button mode="white">2列</Button>
23+
<Button type="primary">2列</Button>
2424
</Flex.Item>
2525
</Flex>
2626
</WingBlank>
@@ -31,7 +31,7 @@ let FlexExample = React.createClass({
3131
<Button size="small">3列</Button>
3232
</Flex.Item>
3333
<Flex.Item>
34-
<Button mode="white" size="small">3列</Button>
34+
<Button type="primary" size="small">3列</Button>
3535
</Flex.Item>
3636
<Flex.Item>
3737
<Button size="small">3列</Button>
@@ -42,36 +42,36 @@ let FlexExample = React.createClass({
4242
<WingBlank>
4343
<Flex>
4444
<Flex.Item>
45-
<Button size="little">4列</Button>
45+
<Button>4列</Button>
4646
</Flex.Item>
4747
<Flex.Item>
48-
<Button mode="white" size="little">4列</Button>
48+
<Button type="primary">4列</Button>
4949
</Flex.Item>
5050
<Flex.Item>
51-
<Button size="little">4列</Button>
51+
<Button>4列</Button>
5252
</Flex.Item>
5353
<Flex.Item>
54-
<Button mode="white" size="little">4列</Button>
54+
<Button type="primary">4列</Button>
5555
</Flex.Item>
5656
</Flex>
5757
</WingBlank>
5858
<WhiteSpace />
5959
<WingBlank>
6060
<Flex>
6161
<Flex.Item>
62-
<Button size="tiny">5列</Button>
62+
<Button size="small">5列</Button>
6363
</Flex.Item>
6464
<Flex.Item>
65-
<Button mode="white" size="tiny">5列</Button>
65+
<Button type="primary">5列</Button>
6666
</Flex.Item>
6767
<Flex.Item>
68-
<Button size="tiny">5列</Button>
68+
<Button size="small">5列</Button>
6969
</Flex.Item>
7070
<Flex.Item>
71-
<Button mode="white" size="tiny">5列</Button>
71+
<Button type="primary">5列</Button>
7272
</Flex.Item>
7373
<Flex.Item>
74-
<Button mode="white" size="tiny">5列</Button>
74+
<Button type="primary">5列</Button>
7575
</Flex.Item>
7676
</Flex>
7777
</WingBlank>

‎components/list/demo/twoline.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ ReactDOM.render(
3131
needActive={false}
3232
line={2}
3333
extra={<Button
34-
mode="light"
35-
size="tiny"
34+
size="small"
3635
inline
3736
onClick={() => {alert(111);}}
3837
>按钮</Button>}

‎kitchen-sink/component/ButtonExample.jsx

+10-13
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ const ButtonExample = React.createClass({
88
render() {
99
return (
1010
<Page title="按钮" subtitle="&lt;Button size='small' onClick={() => {}}/&gt;">
11-
<WhiteSpace/>
11+
<WhiteSpace />
1212
<WingBlank>
1313
<Button type="primary">primary按钮</Button>
1414
</WingBlank>
15-
<WhiteSpace/>
15+
<WhiteSpace />
1616
<WingBlank>
1717
<Button type="primary" ghost>primary ghost 按钮</Button>
1818
</WingBlank>
19-
<WhiteSpace mode={20}/>
19+
<WhiteSpace mode={20} />
2020
<WingBlank>
2121
<Button>default 按钮</Button>
2222
</WingBlank>
23-
<WhiteSpace mode={20}/>
23+
<WhiteSpace mode={20} />
2424
<WingBlank>
2525
<Button ghost>default ghost 按钮</Button>
2626
</WingBlank>
27-
<WhiteSpace mode={20}/>
27+
<WhiteSpace mode={20} />
2828
<Button type="warning">warning按钮</Button>
29-
<WhiteSpace/>
29+
<WhiteSpace />
3030
<Button type="primary" disabled>primary 按钮</Button>
31-
<WhiteSpace/>
31+
<WhiteSpace />
3232
<WingBlank>
3333
<Flex>
3434
<Flex.Item>
@@ -39,7 +39,6 @@ const ButtonExample = React.createClass({
3939
</Flex.Item>
4040
</Flex>
4141
</WingBlank>
42-
<WhiteSpace/>
4342
<WingBlank>
4443
<Flex>
4544
<Flex.Item>
@@ -50,8 +49,7 @@ const ButtonExample = React.createClass({
5049
</Flex.Item>
5150
</Flex>
5251
</WingBlank>
53-
54-
<WhiteSpace/>
52+
<WhiteSpace />
5553
<WingBlank>
5654
<Flex>
5755
<Flex.Item>
@@ -62,7 +60,6 @@ const ButtonExample = React.createClass({
6260
</Flex.Item>
6361
</Flex>
6462
</WingBlank>
65-
<WhiteSpace/>
6663
<WingBlank>
6764
<Flex>
6865
<Flex.Item>
@@ -73,7 +70,7 @@ const ButtonExample = React.createClass({
7370
</Flex.Item>
7471
</Flex>
7572
</WingBlank>
76-
<WhiteSpace/>
73+
<WhiteSpace />
7774
<WingBlank>
7875
<Flex>
7976
<Flex.Item>
@@ -84,7 +81,7 @@ const ButtonExample = React.createClass({
8481
</Flex.Item>
8582
</Flex>
8683
</WingBlank>
87-
<WhiteSpace/>
84+
<WhiteSpace />
8885
<WingBlank>
8986
<Button size="large" inline>inline 按钮</Button>
9087
</WingBlank>

‎kitchen-sink/component/FlexExample.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const FlexExample = React.createClass({
66
render() {
77
return (
88
<Page title="Flex布局" subtitle="&lt;Flex&gt;&lt;Flex.Item /&gt;&lt;Flex.Item /&gt;&lt;/Flex&gt;">
9-
<WhiteSpace/>
9+
<WhiteSpace />
1010
<WingBlank>
1111
<Flex>
1212
<Flex.Item>
@@ -17,7 +17,7 @@ const FlexExample = React.createClass({
1717
</Flex.Item>
1818
</Flex>
1919
</WingBlank>
20-
<WhiteSpace/>
20+
<WhiteSpace />
2121
<WingBlank>
2222
<Flex>
2323
<Flex.Item>
@@ -31,7 +31,7 @@ const FlexExample = React.createClass({
3131
</Flex.Item>
3232
</Flex>
3333
</WingBlank>
34-
<WhiteSpace/>
34+
<WhiteSpace />
3535
<WingBlank>
3636
<Flex>
3737
<Flex.Item>
@@ -48,7 +48,7 @@ const FlexExample = React.createClass({
4848
</Flex.Item>
4949
</Flex>
5050
</WingBlank>
51-
<WhiteSpace/>
51+
<WhiteSpace />
5252
<WingBlank>
5353
<Flex>
5454
<Flex.Item>

0 commit comments

Comments
 (0)
Please sign in to comment.