Merge branch 'master' into font-size

hasgeek · Jun 12, 2020 · 48ca5c3 · 48ca5c3
2 parents 8b85614 + a310008
commit 48ca5c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/baseframe/static/css/mui.css b/baseframe/static/css/mui.css
@@ -4390,7 +4390,7 @@ li p + ol {
   overflow: hidden;
   padding: 16px;
   width: 100%;
-  height: auto;
+  height: 100%;
   max-width: 100%;
   border-radius: 0;
 }

diff --git a/baseframe/static/sass/baseframe-material/_modal.scss b/baseframe/static/sass/baseframe-material/_modal.scss
@@ -11,7 +11,7 @@
     padding: $mui-grid-padding;
     @extend .mui--z1;
     width: 100%;
-    height: auto;
+    height: 100%;
     max-width: 100%;
     border-radius: 0;