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
2 changes: 1 addition & 1 deletion example/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class Presentation extends React.Component {
<Text textSize="1.5em" margin="20px 0px 0px" bold>Hit Your Right Arrow To Begin!</Text>
</Slide>
<Slide id="wait-what" transition={['slide']} bgColor="black" notes="You can even put notes on your slide. How awesome is that?">
<Image src={images.kat.replace('/', '')} margin="0px auto 40px" height="293px"/>
<Image src={images.kat.replace('/', '')} margin="0px auto 40px" />
<Heading size={2} caps fit textColor="primary" textFont="primary">
Wait what?
</Heading>
Expand Down
2 changes: 2 additions & 0 deletions src/components/__snapshots__/image.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ exports[`<Image /> should render correctly. 1`] = `
Object {
"display": "inline-block",
"height": 1440,
"maxHeight": "100%",
"maxWidth": "100%",
"width": 2560,
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export default class Image extends Component {
const styles = {
width: this.props.width || '',
height: this.props.height || '',
maxWidth: '100%',
maxHeight: '100%',
display: this.props.display || ''
};
return (
Expand Down