Skip to content

Commit 09fe7a5

Browse files
committed
Merge pull request react-bootstrap#1252 from AlexKVal/airbnb
Next portion of 'Airbnb'
2 parents bb0f1c6 + 3713022 commit 09fe7a5

129 files changed

Lines changed: 954 additions & 985 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,20 @@
2020
"func-names": 0,
2121
"guard-for-in": 0,
2222
"one-var": [2, { "initialized": "never" }],
23-
"padded-blocks": 0,
2423
"prefer-const": 0,
2524
"key-spacing": 0,
2625
"no-eq-null": 0,
2726
"no-else-return": 0,
28-
"no-multiple-empty-lines": 0,
29-
"no-nested-ternary": 0,
3027
"no-param-reassign": 0,
3128
"no-this-before-super": 2,
32-
"no-throw-literal": 0,
3329
"no-underscore-dangle": 0,
3430
"no-undef": 2,
3531
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
36-
"no-use-before-define": 0,
3732
"no-var": 2,
3833
"babel/object-shorthand": 2,
3934
"quotes": [2, "single", "avoid-escape"],
4035
"react/display-name": 0,
4136
"react/jsx-boolean-value": [2, "never"],
42-
"react/jsx-quotes": 0,
4337
"react/jsx-no-duplicate-props": 2,
4438
"react/jsx-no-undef": 2,
4539
"react/jsx-uses-react": 2,

docs/build.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export default function BuildDocs({dev}) {
4646
.then(() => fsp.mkdir(docsBuilt))
4747
.then(metadata)
4848
.then(propData => {
49-
5049
let pagesGenerators = Root.getPages().map( page => generateHTML(page, propData));
5150

5251
return Promise.all(pagesGenerators.concat([

docs/examples/AlertAutoDismissable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const AlertAutoDismissable = React.createClass({
88
render() {
99
if (this.state.alertVisible) {
1010
return (
11-
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
11+
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss} dismissAfter={2000}>
1212
<h4>Oh snap! You got an error!</h4>
1313
<p>But this will hide after 2 seconds.</p>
1414
</Alert>

docs/examples/AlertBasic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const alertInstance = (
2-
<Alert bsStyle='warning'>
2+
<Alert bsStyle="warning">
33
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
44
</Alert>
55
);

docs/examples/AlertDismissable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ const AlertDismissable = React.createClass({
88
render() {
99
if (this.state.alertVisible) {
1010
return (
11-
<Alert bsStyle='danger' onDismiss={this.handleAlertDismiss}>
11+
<Alert bsStyle="danger" onDismiss={this.handleAlertDismiss}>
1212
<h4>Oh snap! You got an error!</h4>
1313
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
1414
<p>
15-
<Button bsStyle='danger'>Take this action</Button>
15+
<Button bsStyle="danger">Take this action</Button>
1616
<span> or </span>
1717
<Button onClick={this.handleAlertDismiss}>Hide Alert</Button>
1818
</p>

docs/examples/ButtonActive.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const buttonsInstance = (
22
<ButtonToolbar>
3-
<Button bsStyle='primary' bsSize='large' active>Primary button</Button>
4-
<Button bsSize='large' active>Button</Button>
3+
<Button bsStyle="primary" bsSize="large" active>Primary button</Button>
4+
<Button bsSize="large" active>Button</Button>
55
</ButtonToolbar>
66
);
77

docs/examples/ButtonBlock.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const wellStyles = {maxWidth: 400, margin: '0 auto 10px'};
22

33
const buttonsInstance = (
4-
<div className='well' style={wellStyles}>
5-
<Button bsStyle='primary' bsSize='large' block>Block level button</Button>
6-
<Button bsSize='large' block>Block level button</Button>
4+
<div className="well" style={wellStyles}>
5+
<Button bsStyle="primary" bsSize="large" block>Block level button</Button>
6+
<Button bsSize="large" block>Block level button</Button>
77
</div>
88
);
99

docs/examples/ButtonDisabled.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const buttonsInstance = (
22
<ButtonToolbar>
3-
<Button bsStyle='primary' bsSize='large' disabled>Primary button</Button>
4-
<Button bsSize='large' disabled>Button</Button>
3+
<Button bsStyle="primary" bsSize="large" disabled>Primary button</Button>
4+
<Button bsSize="large" disabled>Button</Button>
55
</ButtonToolbar>
66
);
77

docs/examples/ButtonGroupJustified.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const buttonGroupInstance = (
22
<ButtonGroup justified>
3-
<Button href='#'>Left</Button>
4-
<Button href='#'>Middle</Button>
5-
<DropdownButton title='Dropdown' id='bg-justified-dropdown'>
6-
<MenuItem eventKey='1'>Dropdown link</MenuItem>
7-
<MenuItem eventKey='2'>Dropdown link</MenuItem>
3+
<Button href="#">Left</Button>
4+
<Button href="#">Middle</Button>
5+
<DropdownButton title="Dropdown" id="bg-justified-dropdown">
6+
<MenuItem eventKey="1">Dropdown link</MenuItem>
7+
<MenuItem eventKey="2">Dropdown link</MenuItem>
88
</DropdownButton>
99
</ButtonGroup>
1010
);

docs/examples/ButtonGroupNested.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ const buttonGroupInstance = (
22
<ButtonGroup>
33
<Button>1</Button>
44
<Button>2</Button>
5-
<DropdownButton title='Dropdown' id='bg-nested-dropdown'>
6-
<MenuItem eventKey='1'>Dropdown link</MenuItem>
7-
<MenuItem eventKey='2'>Dropdown link</MenuItem>
5+
<DropdownButton title="Dropdown" id="bg-nested-dropdown">
6+
<MenuItem eventKey="1">Dropdown link</MenuItem>
7+
<MenuItem eventKey="2">Dropdown link</MenuItem>
88
</DropdownButton>
99
</ButtonGroup>
1010
);

0 commit comments

Comments
 (0)