From c5e31975e2e258ee9cc0a405c0d63ec41229ad03 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 17 Feb 2020 11:49:32 -0500
Subject: [PATCH] Fix inputs in member modal forms

---
 styles/components/_member_form.scss               | 15 ++++-----------
 styles/elements/_inputs.scss                      | 11 ++++-------
 templates/applications/fragments/members.html     |  5 +++--
 templates/components/multi_step_modal_form.html   |  4 ++--
 .../portfolios/fragments/portfolio_members.html   |  5 +++--
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/styles/components/_member_form.scss b/styles/components/_member_form.scss
index 5cbeaf87..3644fce2 100644
--- a/styles/components/_member_form.scss
+++ b/styles/components/_member_form.scss
@@ -5,17 +5,11 @@
     margin-left: 0;
   }
 
-  .input__inline-fields {
-    text-align: left;
-
-    .usa-input__choices label {
-      font-weight: $font-bold;
-    }
-  }
-
   .input__inline-fields {
     padding: $gap * 2;
     border: 1px solid $color-gray-lighter;
+    text-align: left;
+    max-width: 100%;
 
     &.checked {
       border: 1px solid $color-blue;
@@ -33,7 +27,7 @@
 
   .user-info {
     .usa-input {
-      width: 45rem;
+      max-width: $max-input-width;
 
       input,
       label,
@@ -53,8 +47,7 @@
   }
 }
 
-#modal--add-app-mem,
-#modal--add-portfolio-manager {
+.form-content--member-form {
   .modal__body {
     min-width: 75rem;
   }
diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index c5a02e59..1a1d1252 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -371,19 +371,15 @@ select {
 .phone-input {
   display: flex;
   flex-direction: row;
+  justify-content: flex-start;
 
   &__phone {
     margin-right: $gap * 4;
+    flex-grow: 1;
 
     .usa-input {
       margin: 0;
 
-      input,
-      label,
-      .usa-input__message {
-        max-width: 20rem;
-      }
-
       .icon-validation {
         left: 20rem;
       }
@@ -391,7 +387,8 @@ select {
   }
 
   &__extension {
-    margin-left: $gap * 4;
+    margin-right: $gap * 4;
+    flex-grow: 0;
 
     .usa-input {
       margin: 0;
diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html
index f60fcba8..5fbecd35 100644
--- a/templates/applications/fragments/members.html
+++ b/templates/applications/fragments/members.html
@@ -36,7 +36,7 @@
       {% set invite_expired = member.role_status == 'invite_expired' %}
       {%- if user_can(permissions.EDIT_APPLICATION_MEMBER) %}
         {% set modal_name = "edit_member-{}".format(loop.index) %}
-        {% call Modal(modal_name, classes="form-content--app-mem") %}
+        {% call Modal(modal_name, classes="form-content--member-form") %}
           <div class="modal__form--header">
             <h1>{{ Icon('avatar') }} {{ "portfolios.applications.members.form.edit_access_header" | translate({ "user": member.user_name }) }}</h1>
           </div>
@@ -56,7 +56,7 @@
 
         {%- if invite_pending or invite_expired %}
           {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
-          {% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
+          {% call Modal(resend_invite_modal, classes="form-content--member-form") %}
             <div class="modal__form--header">
               <h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
             </div>
@@ -183,6 +183,7 @@
             modal=new_member_modal_name,
           )
         ],
+        classes="form-content--member-form",
       ) }}
   {% endif %}
   </div>
diff --git a/templates/components/multi_step_modal_form.html b/templates/components/multi_step_modal_form.html
index a7f71edf..d3c9b520 100644
--- a/templates/components/multi_step_modal_form.html
+++ b/templates/components/multi_step_modal_form.html
@@ -25,10 +25,10 @@
   </div>
 {% endmacro %}
 
-{% macro MultiStepModalForm(name, form, form_action, steps, dismissable=False) -%}
+{% macro MultiStepModalForm(name, form, form_action, steps, dismissable=False, classes="") -%}
   {% set step_count = steps|length %}
   <multi-step-modal-form inline-template :steps={{ step_count }}>
-    {% call Modal(name=name, dismissable=dismissable) %}
+    {% call Modal(name=name, dismissable=dismissable, classes=classes) %}
       <form id="{{ name }}" action="{{ form_action }}" method="POST" v-on:submit="handleSubmit">
         {{ form.csrf_token }}
         <div v-if="$root.activeModal === '{{ name }}'">
diff --git a/templates/portfolios/fragments/portfolio_members.html b/templates/portfolios/fragments/portfolio_members.html
index 91e99d24..6e9c4be2 100644
--- a/templates/portfolios/fragments/portfolio_members.html
+++ b/templates/portfolios/fragments/portfolio_members.html
@@ -14,7 +14,7 @@
       {% set invite_expired = member.status == 'invite_expired' %}
 
       {% set modal_name = "edit_member-{}".format(loop.index) %}
-      {% call Modal(modal_name, classes="form-content--app-mem") %}
+      {% call Modal(modal_name, classes="form-content--member-form") %}
         <div class="modal__form--header">
           <h1>{{ Icon('avatar') }} {{ "portfolios.applications.members.form.edit_access_header" | translate({ "user": member.user_name }) }}</h1>
         </div>
@@ -34,7 +34,7 @@
 
       {% if invite_pending or invite_expired -%}
         {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
-        {% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
+        {% call Modal(resend_invite_modal, classes="form-content--member-form") %}
           <div class="modal__form--header">
             <h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
           </div>
@@ -182,6 +182,7 @@
           modal=new_manager_modal,
         )
       ],
+      classes="form-content--member-form",
     ) }}
   {% endif %}
 </div>