Skip to content

Commit

Permalink
Minimal changes
Browse files Browse the repository at this point in the history
  • Loading branch information
soyjavi committed Jul 7, 2015
1 parent e174374 commit 2114955
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 0 additions & 2 deletions components/aside/index.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ module.exports = React.createClass
type : React.PropTypes.string.required

getDefaultProps: ->
active : false
className : ""
hideable : false
type : "left"

getInitialState: ->
Expand Down
8 changes: 4 additions & 4 deletions components/button/button.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
var Button = require('react-toolbox/components/button');
<Button caption="Login" />
<Button caption="Primary" style="primary" icon="access_alarm" />
<Button caption="Secondary" style="secondary" />
<Button caption="Primary" className="primary" icon="access_alarm" />
<Button caption="Secondary" className="secondary" />
<Button caption="Disabled" disabled />
<Button type="circle" icon="access_alarm" />
<Button type="circle" icon="explore" style="primary" />
<Button type="circle" icon="zoom_in" style="secondary" />
<Button type="circle" icon="explore" className="primary" />
<Button type="circle" icon="zoom_in" className="secondary" />
<Button type="circle" icon="input" disabled={true} />
```

Expand Down
8 changes: 4 additions & 4 deletions spec/components/button.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ module.exports = React.createClass
<h2>Buttons</h2>
<p>lorem ipsum...</p>
<Button caption="Login" disabled=false />
<Button caption="Primary" style="primary" icon="access_alarm" />
<Button caption="Secondary" style="secondary" />
<Button caption="Primary" className="primary" icon="access_alarm" />
<Button caption="Secondary" className="secondary" />
<Button caption="Disabled" disabled={true} />

<Button type="circle" icon="access_alarm" />
<Button type="circle" icon="explore" style="primary" />
<Button type="circle" icon="zoom_in" style="secondary" />
<Button type="circle" icon="explore" className="primary" />
<Button type="circle" icon="zoom_in" className="secondary" />
<Button type="circle" icon="input" disabled={true} />

</section>

0 comments on commit 2114955

Please sign in to comment.