Remove full height modal. Add full height for modal forms. Fix the au…

…tofocus value
hasgeek · Jul 16, 2020 · a9d15ee · a9d15ee
1 parent 16cf6cd
commit a9d15ee
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/baseframe/static/css/mui.css b/baseframe/static/css/mui.css
@@ -4440,10 +4440,7 @@ li p + ol {
   display: inline-block;
   overflow: hidden;
   padding: 16px;
-  width: 100%;
-  min-height: 100%;
-  max-width: 100%;
-  border-radius: 0;
+  border-radius: 8px;
 }
 .jquery-modal.blocker.current .modal a.close-modal {
   display: none;
@@ -4457,6 +4454,12 @@ li p + ol {
 .jquery-modal.blocker.current .modal .modal__body__btn {
   margin-top: 16px;
 }
+.jquery-modal.blocker.current .modal-form {
+  width: 100%;
+  border-radius: 0;
+  overflow: auto;
+  min-height: 100%;
+}
 
 @media (min-width: 768px) {
   .jquery-modal.blocker.current {

diff --git a/baseframe/static/sass/baseframe-material/_modal.scss b/baseframe/static/sass/baseframe-material/_modal.scss
@@ -10,10 +10,7 @@
     overflow: hidden;
     padding: $mui-grid-padding;
     @extend .mui--z1;
-    width: 100%;
-    min-height: 100%;
-    max-width: 100%;
-    border-radius: 0;
+    border-radius: 8px;
 
     //Use fa5 icon for close
     a.close-modal {
@@ -36,6 +33,12 @@
       margin-top: $mui-grid-padding;
     }
   }
+  .modal-form {
+    width: 100%;
+    border-radius: 0;
+    overflow: auto;
+    min-height: 100%;
+  }
 }
 
 @media (min-width: 768px) {

diff --git a/baseframe/templates/baseframe/mui/forms.html.jinja2 b/baseframe/templates/baseframe/mui/forms.html.jinja2
@@ -156,12 +156,13 @@
     <input type="hidden" name="form.revision" value="{{ draft_revision if draft_revision is not none }}" />
   {%- endif %}
   {%- set autofocus = true %}
+  {% set autofocus = namespace(val=true) %}
   {% for field in form -%}
     {%- if field.type in ['CSRFTokenField', 'HiddenField', 'NonceField'] -%}
       {# Don't show hidden #}
     {%- else -%}
-      {{ renderfield(field, autofocus=autofocus, style=style) }}
-      {%- if autofocus %}{% set autofocus = false %}{% endif %}
+      {{ renderfield(field, autofocus=autofocus.val, style=style) }}
+      {%- if autofocus.val %}{% set autofocus.val = false %}{% endif %}
     {%- endif %}
   {% endfor %}
 {%- endmacro %}