Skip to content
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
30 changes: 30 additions & 0 deletions src/components/card.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';

const _ = require('lodash');
const React = require('react');

const defaultStyle = {
boxShadow: '0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)',
backgroundColor: 'white',
padding: '16px',
borderRadius: '2px'
};

class Card extends React.Component {
render(){
const {
style = {},
children
} = this.props;

const styles = _.assign({}, defaultStyle, style);

return (
<div style={styles}>
{children}
</div>
);
}
}

module.exports = Card;
5 changes: 3 additions & 2 deletions src/components/overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

const _ = require('lodash');
const React = require('react');
const Card = require('react-material/components/Card');

const Card = require('./card');

const styles = {
overlay: {
Expand Down Expand Up @@ -31,7 +32,7 @@ class Overlay extends React.Component {
}

return (
<Card styles={cardStyle}>
<Card style={cardStyle}>
{children}
</Card>
);
Expand Down
5 changes: 2 additions & 3 deletions src/components/projects-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ const { MainButton } = require('react-mfb-iceddev');
const styles = {
changeFolderButton: {
position: 'absolute',
top: -28,
top: 28,
margin: 0,
right: 19,
left: 'auto',
left: 140,
transform: 'none'
}
};
Expand Down
5 changes: 3 additions & 2 deletions src/components/sidebar.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
'use strict';

const React = require('react');
const Card = require('react-material/components/Card');

const Card = require('./card');

const styles = {
card: {
Expand All @@ -20,7 +21,7 @@ class Sidebar extends React.Component {
} = this.props;

return (
<Card styles={styles.card}>
<Card style={styles.card}>
{children}
</Card>
);
Expand Down
4 changes: 3 additions & 1 deletion src/views/download-overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ const ProgressBar = require('../components/progress-bar');
const styles = {
overlay: {
paddingBottom: 40,
width: 600
width: 600,
// keep the download progress pinned to the bottom
position: 'relative'
},
overlayFooter: {
marginLeft: 0,
Expand Down