From a4df658857ec3204739b9978f3ac1a27241846af Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 9 Sep 2019 15:16:43 -0400
Subject: [PATCH] Move cancel button in add env form

---
 styles/components/_portfolio_layout.scss             |  2 +-
 .../fragments/applications/add_new_environment.html  | 12 +++++-------
 templates/portfolios/applications/settings.html      |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 848467dd..240c3c35 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -287,7 +287,7 @@
       @include subheading;
       position: relative;
 
-      .icon-link {
+      .icon-link__add {
         position: absolute;
         right: 0;
         top: 0;
diff --git a/templates/fragments/applications/add_new_environment.html b/templates/fragments/applications/add_new_environment.html
index e8190e14..32fded93 100644
--- a/templates/fragments/applications/add_new_environment.html
+++ b/templates/fragments/applications/add_new_environment.html
@@ -18,17 +18,15 @@
         </div>
         <div class="panel__footer">
           <div class="action-group">
-            <div class='action-group-cancel'>
-              <a class='action-group-cancel__action icon-link icon-link--default' v-on:click="toggle">
-                {{ "common.cancel" | translate }}
-              </a>
-              {{ SaveButton(text=('common.save' | translate), element="input", form="add-new-env") }}
-            </div>
+            {{ SaveButton(text=('common.save' | translate), element="input", form="add-new-env") }}
+            <a class='action-group__action icon-link icon-link--default' v-on:click="toggle">
+              {{ "common.cancel" | translate }}
+            </a>
           </div>
         </div>
       </form>
     </div>
-    <a class='icon-link' v-on:click="toggle">
+    <a class='icon-link icon-link__add' v-on:click="toggle">
       {{ Icon('plus') }}
       {{ "portfolios.applications.add_environment" | translate }}
     </a>
diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html
index 68550046..1c1957b0 100644
--- a/templates/portfolios/applications/settings.html
+++ b/templates/portfolios/applications/settings.html
@@ -103,7 +103,7 @@
 
       {% set new_member_modal_name = "add-app-mem" %}
       {% if user_can(permissions.CREATE_APPLICATION_MEMBER) %}
-        <a class="icon-link modal-link" v-on:click="openModal('{{ new_member_modal_name }}')">
+        <a class="icon-link modal-link icon-link__add" v-on:click="openModal('{{ new_member_modal_name }}')">
           {{ Icon("plus") }}
           {{ "portfolios.applications.add_member" | translate }}
         </a>