Merge pull request mastermoo#74 from gina-system/master

mastermoo · web-flow · commit 27fb8f9ee214 · 2016-08-24T11:55:39.000+02:00
Fixed bottom margin in version 2.0.0
diff --git a/ActionButton.js b/ActionButton.js
@@ -8,6 +8,8 @@ const alignItemsMap = {
   "right" : "flex-end"
 }
 
+const shadowHeight = 12;
+
 export default class ActionButton extends Component {
 
   constructor(props) {
@@ -45,7 +47,7 @@ export default class ActionButton extends Component {
   getButtonSize() {
     return {
       width: this.props.size,
-      height: this.props.size,
+      height: this.props.size + shadowHeight,
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ const alignItemsMap = {`
`8`	`8`	`"right" : "flex-end"`
`9`	`9`	`}`
`10`	`10`
	`11`	`+const shadowHeight = 12;`
	`12`	`+`
`11`	`13`	`export default class ActionButton extends Component {`
`12`	`14`
`13`	`15`	`constructor(props) {`
`@@ -45,7 +47,7 @@ export default class ActionButton extends Component {`
`45`	`47`	`getButtonSize() {`
`46`	`48`	`return {`
`47`	`49`	`width: this.props.size,`
`48`		`- height: this.props.size,`
	`50`	`+ height: this.props.size + shadowHeight,`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`