Skip to content

Commit

Permalink
Fixing font scaling & patch bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kenwheeler committed Dec 8, 2015
1 parent 3e2f152 commit fd85d3a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spectacle",
"version": "1.0.0",
"version": "1.0.1",
"description": "ReactJS Powered Presentation Framework",
"main": "lib/index.js",
"scripts": {
Expand Down
4 changes: 3 additions & 1 deletion src/components/slide.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,13 @@ const Slide = React.createClass({
flex: 1,
maxHeight: this.props.maxHeight || 700,
maxWidth: this.props.maxWidth || 1000,
fontSize: 16 * this.state.zoom,
transform: `scale(${this.state.contentScale})`,
padding: this.state.zoom > 0.6 ? this.props.margin || 40 : 10
}
};

document.documentElement.style.fontSize = `${16 * this.state.zoom}px`;

return (
<div className="spectacle-slide"
ref="slide"
Expand Down
3 changes: 2 additions & 1 deletion src/themes/default/screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
blockquote: {
textAlign: "left",
position: "relative",
display: "inline-block"
display: "inline-block",
margin: 20
},
quote: {
borderLeft: `1px solid ${colors.primary}`,
Expand Down

0 comments on commit fd85d3a

Please sign in to comment.