Merge pull request #9 from open-sausages/pulls/4.0/6355-modal-height

FIX react modal height
silverstripe · Mar 29, 2017 · 0424276 · 0424276
2 parents 0c9abd8 + 1a50a6e
commit 0424276
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .sass-cache
 /vendor/
 /node_modules/
+/**/*.js.map
+/**/*.css.map
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
@@ -15853,7 +15853,7 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
 .modal-content{
   overflow:hidden;
   border:0;
-  height:100%;
+  height:auto;
 }
 
 .modal-header{

diff --git a/client/src/components/Modal/Modal.scss b/client/src/components/Modal/Modal.scss
@@ -6,7 +6,7 @@
 .modal-content {
   overflow: hidden;
   border: 0;
-  height: 100%; // IE10 fix
+  height: auto;
 }