From b7a8cd4168f4557d55a7a385b0665b57994ea391 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 25 Apr 2019 14:12:06 -0400
Subject: [PATCH] Refinements to the new application member modal

- remove extra padding from second modal screen
- update modal styles to more closely match designs
- ad `user_name` property to application_role model to fix flash message
---
 atst/models/application_role.py                               | 4 ++++
 styles/components/_modal.scss                                 | 4 +++-
 .../fragments/applications/add_new_application_member.html    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/atst/models/application_role.py b/atst/models/application_role.py
index 3ae42845..fd606216 100644
--- a/atst/models/application_role.py
+++ b/atst/models/application_role.py
@@ -51,6 +51,10 @@ class ApplicationRole(
         "PermissionSet", secondary=application_roles_permission_sets
     )
 
+    @property
+    def user_name(self):
+        return self.user.full_name
+
     def __repr__(self):
         return "<ApplicationRole(application='{}', user_id='{}', id='{}', permissions={})>".format(
             self.application.name, self.user_id, self.id, self.permissions
diff --git a/styles/components/_modal.scss b/styles/components/_modal.scss
index b2c31798..2962a8f7 100644
--- a/styles/components/_modal.scss
+++ b/styles/components/_modal.scss
@@ -43,6 +43,7 @@ body {
       background-color: $color-white;
       padding: $gap * 2;
       width: 100%;
+      border-radius: 5px;
 
       overflow-y: auto;
       -ms-overflow-style: scrollbar;
@@ -52,7 +53,7 @@ body {
       }
 
       @include media($medium-screen) {
-        padding: $gap * 4;
+        padding: $gap * 5;
       }
 
       h1, h2 {
@@ -186,6 +187,7 @@ body {
 
     .form-row {
       margin-top: 0;
+      margin-bottom: 0;
 
       .form-col {
         .usa-input {
diff --git a/templates/fragments/applications/add_new_application_member.html b/templates/fragments/applications/add_new_application_member.html
index 85cf425e..6e039726 100644
--- a/templates/fragments/applications/add_new_application_member.html
+++ b/templates/fragments/applications/add_new_application_member.html
@@ -41,7 +41,7 @@
   </div>
 {% endset %}
 {% set step_two %}
-  <div class="modal__form--padded">
+  <div class="modal__form">
     <div class="modal__form--header">
       <h1>{{ "portfolios.applications.members.new.assign_roles" | translate }}</h1>
       <a class='icon-link'>