File tree Expand file tree Collapse file tree 3 files changed +15
-6
lines changed Expand file tree Collapse file tree 3 files changed +15
-6
lines changed Original file line number Diff line number Diff line change 11import React from "react/addons" ;
22import tweenState from "react-tween-state" ;
33import _ from "lodash" ;
4+ import assign from "object-assign" ;
45
56const Appear = React . createClass ( {
67 mixins : [ tweenState . Mixin ] ,
@@ -52,7 +53,7 @@ const Appear = React.createClass({
5253 opacity : this . getTweeningValue ( "opacity" )
5354 } ;
5455 return (
55- < div style = { styles } className = "fragment" ref = "fragment" >
56+ < div style = { assign ( { } , this . props . style , styles ) } className = "fragment" ref = "fragment" >
5657 { this . props . children }
5758 </ div >
5859 ) ;
Original file line number Diff line number Diff line change @@ -91,13 +91,10 @@ const Slide = React.createClass({
9191 } ,
9292 content : {
9393 flex : 1 ,
94- position : "absolute" ,
95- top : "50%" ,
96- left : "50%" ,
9794 maxHeight : config . height ,
98- width : config . width ,
95+ maxWidth : config . width ,
9996 fontSize : 16 * this . state . zoom ,
100- transform : " translate(-50%,-50%) scale(" + this . state . contentScale + ")" ,
97+ transform : "scale(" + this . state . contentScale + ")" ,
10198 padding : this . state . zoom > 0.6 ? config . margin : 10
10299 }
103100 } ;
Original file line number Diff line number Diff line change @@ -12,3 +12,14 @@ _:-moz-tree-row(hover), .spectacle-deck {
1212_ : -moz-tree-row (hover ), ul .appear {
1313 display : inline;
1414}
15+
16+ html , body {
17+ height : 100% ;
18+ width : 100% ;
19+ margin : 0 ;
20+ padding : 0 ;
21+ }
22+
23+ * {
24+ box-sizing : border-box;
25+ }
You can’t perform that action at this time.
0 commit comments