Fixing padding issues

lms/static/sass/course/instructor/_instructor_2.scss

@@ -559,7 +559,11 @@
     }
 
     .form-actions {
-      @include padding($baseline 0 $baseline 0);
+      padding: $baseline 0;
+
+      &.new-cohort-form {
+        padding: $baseline;
+      }
     }
   }
 
@@ -1097,6 +1101,14 @@
   .tab-content {
     @include padding($baseline $baseline 0 $baseline);
     border: 1px solid $gray-l5;
+
+    &.new-cohort-form {
+      padding: 0 $baseline;
+
+      .form-label {
+        margin-top: $baseline;
+      }
+    }
   }
 }
 

lms/templates/instructor/instructor_dashboard_2/cohort-form.underscore

@@ -3,8 +3,8 @@
     <form action="" method="post" name="" id="cohort-management-settings-form" class="cohort-management-settings-form">
         <% if (isNewCohort) { %>
             <h3 class="form-title"><%- gettext('Add a New Cohort Group') %></h3>
+            <div class="tab-content is-visible new-cohort-form">
         <% } %>
-
         <div class="form-fields">
             <%
             // Don't allow renaming of existing cohorts yet as it doesn't interact well with
@@ -113,8 +113,11 @@
                 </div>
             </div>
         </div>
+        <% if (isNewCohort) { %>
+        </div>
+        <% } %>
 
-        <div class="form-actions">
+        <div class="form-actions <% if (isNewCohort) { %>new-cohort-form<% } %>">
             <button class="form-submit button action-primary action-save">
                 <i class="icon fa fa-plus" aria-hidden="true"></i>
                 <%- gettext('Save') %>