Merge branch 'feature/dialog-vertical-space' into custom-build

* feature/dialog-vertical-space: allow to lower minPaddingTop with verticalSace
adam187 · Jul 27, 2017 · 613217b · 613217b
2 parents dcdd022 + 8ae9a0d
commit 613217b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Dialog/Dialog.js b/src/Dialog/Dialog.js
@@ -218,8 +218,8 @@ class DialogInline extends Component {
     const container = ReactDOM.findDOMNode(this);
     const dialogWindow = ReactDOM.findDOMNode(this.refs.dialogWindow);
     const dialogContent = ReactDOM.findDOMNode(this.refs.dialogContent);
-    const minPaddingTop = 16;
     const verticalSpace = getVerticalSpace(this.props, this.context);
+    const minPaddingTop = Math.min(16, verticalSpace);
 
     // Reset the height in case the window was resized.
     dialogWindow.style.height = '';