From 217a29b0dcb120341ebb02b4e473644bddc9028d Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Wed, 18 Dec 2019 16:18:47 -0500
Subject: [PATCH] Adjust margins on home page, globally fix hr elements to
 default to having margins, and add class for hr elements to span full width
 of their container

---
 styles/core/_util.scss                                      | 6 +++++-
 styles/sections/_home.scss                                  | 1 +
 templates/applications/fragments/member_form_fields.html    | 2 +-
 templates/applications/fragments/members.html               | 4 ++--
 .../applications/fragments/new_member_modal_content.html    | 2 +-
 .../portfolios/fragments/add_new_portfolio_member.html      | 4 ++--
 templates/portfolios/fragments/change_ppoc.html             | 4 ++--
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/styles/core/_util.scss b/styles/core/_util.scss
index ff6e8e3f..5203da45 100644
--- a/styles/core/_util.scss
+++ b/styles/core/_util.scss
@@ -88,5 +88,9 @@ p {
 hr {
   border: 0;
   border-bottom: 1px solid $color-gray-light;
-  margin: ($gap * 3) ($site-margins * -4);
+  margin: ($gap * 3) 0;
+
+  &.full-width {
+    margin: ($gap * 3) ($site-margins * -4);
+  }
 }
diff --git a/styles/sections/_home.scss b/styles/sections/_home.scss
index 25aac6e3..a721b71c 100644
--- a/styles/sections/_home.scss
+++ b/styles/sections/_home.scss
@@ -1,4 +1,5 @@
 .home {
+  margin: $gap * 3;
   .sticky-cta {
     margin: -1.6rem -1.6rem 0 -1.6rem;
   }
diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html
index 20ecc210..3aa97687 100644
--- a/templates/applications/fragments/member_form_fields.html
+++ b/templates/applications/fragments/member_form_fields.html
@@ -100,7 +100,7 @@
     {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }}
     {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }}
   </div>
-  <hr>
+  <hr class="full-width">
   <div class="environment_roles environment-roles-new">
     <h2>{{ "portfolios.applications.members.form.env_access.title" | translate }}</h2>
     <p class='usa-input__help subtitle'>
diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html
index 1a7bcb4a..be312351 100644
--- a/templates/applications/fragments/members.html
+++ b/templates/applications/fragments/members.html
@@ -40,7 +40,7 @@
         {% call Modal(modal_name, classes="form-content--app-mem") %}
           <div class="modal__form--header">
             <h1>{{ Icon('avatar') }} {{ "portfolios.applications.members.form.edit_access_header" | translate({ "user": member.user_name }) }}</h1>
-            <hr>
+            <hr class="full-width">
           </div>
           <base-form inline-template>
             <form id='{{ modal_name }}' method="POST" action="{{ url_for(action_update, application_id=application.id, application_role_id=member.role_id,) }}">
@@ -59,7 +59,7 @@
           {% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
             <div class="modal__form--header">
               <h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
-              <hr>
+              <hr class="full-width">
             </div>
             <base-form inline-template :enable-save="true">
               <form id='{{ resend_invite_modal }}' method="POST" action="{{ url_for('applications.resend_invite', application_id=application.id, application_role_id=member.role_id) }}">
diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html
index bee6f303..14bb00a2 100644
--- a/templates/applications/fragments/new_member_modal_content.html
+++ b/templates/applications/fragments/new_member_modal_content.html
@@ -2,7 +2,7 @@
 {% import "applications/fragments/member_form_fields.html" as member_fields %}
 
 {% macro MemberFormTemplate(title=None, next_button=None, previous=True) %}
-  <hr>
+  <hr class="full-width">
   {% if title %} <h1>{{ title }}</h1> {% endif %}
 
   {{ caller() }}
diff --git a/templates/portfolios/fragments/add_new_portfolio_member.html b/templates/portfolios/fragments/add_new_portfolio_member.html
index 06ca6038..644f5062 100644
--- a/templates/portfolios/fragments/add_new_portfolio_member.html
+++ b/templates/portfolios/fragments/add_new_portfolio_member.html
@@ -16,7 +16,7 @@
 {% endmacro %}
 
 {% set step_one %}
-  <hr>
+  <hr class="full-width">
   <h1>Invite new portfolio member</h1>
   <div class='form-row'>
     <div class='form-col form-col--half'>
@@ -52,7 +52,7 @@
   </div>
 {% endset %}
 {% set step_two %}
-  <hr>
+  <hr class="full-width">
   <h1>Assign member permissions</h1>
   <a class='icon-link'>
     {{ Icon('info') }}
diff --git a/templates/portfolios/fragments/change_ppoc.html b/templates/portfolios/fragments/change_ppoc.html
index 1eb9a03c..478a55d4 100644
--- a/templates/portfolios/fragments/change_ppoc.html
+++ b/templates/portfolios/fragments/change_ppoc.html
@@ -5,7 +5,7 @@
 {% from "components/options_input.html" import OptionsInput %}
 
 {% set step_one %}
-  <hr>
+  <hr class="full-width">
   <h1>{{ "fragments.ppoc.update_ppoc_title" | translate }}</h1>
 
   {{
@@ -42,7 +42,7 @@
 {% endset %}
 
 {% set step_two %}
-  <hr>
+  <hr class="full-width">
   <h1>{{ "fragments.ppoc.update_ppoc_confirmation_title" | translate }}</h1>
 
   {{