Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New List, ListItem, ListDivider, Avatar Components #836

Merged
merged 16 commits into from
Jun 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/src/app/app-routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var DropDownMenu = require('./components/pages/components/drop-down-menu.jsx');
var Icons = require('./components/pages/components/icons.jsx');
var IconButtons = require('./components/pages/components/icon-buttons.jsx');
var LeftNav = require('./components/pages/components/left-nav.jsx');
var Lists = require('./components/pages/components/lists.jsx');
var Menus = require('./components/pages/components/menus.jsx');
var Paper = require('./components/pages/components/paper.jsx');
var Progress = require('./components/pages/components/progress.jsx');
Expand Down Expand Up @@ -65,6 +66,7 @@ var AppRoutes = (
<Route name="icons" handler={Icons} />
<Route name="icon-buttons" handler={IconButtons} />
<Route name="left-nav" handler={LeftNav} />
<Route name="lists" handler={Lists} />
<Route name="menus" handler={Menus} />
<Route name="paper" handler={Paper} />
<Route name="progress" handler={Progress} />
Expand Down
55 changes: 55 additions & 0 deletions docs/src/app/components/mobile-tear-sheet.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
var React = require('react');
var mui = require('mui');
var SvgIcon = mui.SvgIcon;

var MobileTearSheet = React.createClass({

propTypes: {
height: React.PropTypes.number
},

getDefaultProps: function() {
return {
height: 500
};
},

render: function() {

var styles = {
root: {
float: 'left',
marginBottom: 24,
marginRight: 24,
width: 360

},

container: {
border: 'solid 1px #d9d9d9',
borderBottom: 'none',
height: this.props.height,
overflow: 'hidden'
},

bottomTear: {
display: 'block',
position: 'relative',
marginTop: -10,
width: 360
}
};

return (
<div style={styles.root}>
<div style={styles.container}>
{this.props.children}
</div>
<img style={styles.bottomTear} src="images/bottom-tear.svg" />
</div>
);
}

});

module.exports = MobileTearSheet;
1 change: 1 addition & 0 deletions docs/src/app/components/pages/components.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class Components extends React.Component {
{ route: 'icons', text: 'Icons'},
{ route: 'icon-buttons', text: 'Icon Buttons'},
{ route: 'left-nav', text: 'Left Nav'},
{ route: 'lists', text: 'Lists'},
{ route: 'menus', text: 'Menus'},
{ route: 'paper', text: 'Paper'},
{ route: 'progress', text: 'Progress'},
Expand Down
Loading