From c5013f90285f95af3c60e8c0750f61129dee0efb Mon Sep 17 00:00:00 2001
From: luis cielak <luis+dds@promptworks.com>
Date: Tue, 21 Aug 2018 16:09:22 -0400
Subject: [PATCH] Resolve conflcits

---
 styles/elements/_inputs.scss         | 2 +-
 styles/sections/_projects_list.scss  | 4 ++++
 templates/workspace_project_new.html | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index 14b508ab..53fb9d9f 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -58,7 +58,7 @@
 }
 
 .usa-input {
-  margin:  ($gap * 4) ($gap * 2) ($gap * 4) 0;
+  margin: ($gap * 4) ($gap * 2) ($gap * 4) 0;
 
   @include media($medium-screen) {
     margin: ($gap * 4) 0;
diff --git a/styles/sections/_projects_list.scss b/styles/sections/_projects_list.scss
index fe62b7a6..e48bb7af 100644
--- a/styles/sections/_projects_list.scss
+++ b/styles/sections/_projects_list.scss
@@ -4,6 +4,10 @@
     flex-direction: row;
     justify-content: space-between;
 
+    .usa-input {
+      margin: 0;
+    }
+
     .project-list-item__environment__link {
       @include icon-link;
       @include icon-link-large;
diff --git a/templates/workspace_project_new.html b/templates/workspace_project_new.html
index d9e797f2..e42a2e6f 100644
--- a/templates/workspace_project_new.html
+++ b/templates/workspace_project_new.html
@@ -24,10 +24,9 @@
       </div>
     </div>
 
-    <div class="panel">
       <div class="block-list project-list-item">
         <header class="block-list__header">
-          <h3 class="block-list__title">Project Environments</h3>
+          <h2 class="block-list__title">Project Environments</h2>
           {{ Tooltip(
             "Each environment created within a project is an enclave of cloud resources that is logically separated from each other for increased security.",
             title="learn more"
@@ -35,7 +34,7 @@
         </header>
 
         <ul>
-          <li v-for="(_, i) in environments" class="block-list__item">
+          <li v-for="(_, i) in environments" class="block-list__item project-list-item__environment">
             <span class="project-list-item__environment">
               {{ TextInput(form.environment_name) }}
               <span v-on:click="removeEnvironment(i)">{{ Icon('x') }}</span>
@@ -47,7 +46,7 @@
     </div>
 
     <div class="action-group">
-      <input type="submit" value="Create Project" class="action-group__action usa-button usa-button-big">
+      <input type="submit" value="Create Project" class="usa-button usa-button-primary">
       <a href="{{ url_for('workspaces.workspace_projects', workspace_id=workspace.id) }}" class="action-group__action">Cancel</a>
     </div>
   </form>