SAK-44783 site info > manage groups > edit joinable set > only 1 prim…

…ary action button per form (sakaiproject#8899)
bot2012 · Dec 11, 2020 · b02fb7e · b02fb7e
1 parent 1ddcc40
commit b02fb7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/library/src/morpheus-master/sass/base/_extendables.scss b/library/src/morpheus-master/sass/base/_extendables.scss
@@ -355,6 +355,7 @@
 							var(--button-shadow),
 							var(--button-hover-shadow),
 							var(--button-active-shadow));
+	margin-right: $standard-space;
 }
 
 button.btn-primary, .act .active {

diff --git a/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/joinable_set.html b/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/joinable_set.html
@@ -115,7 +115,7 @@ <h4 class="panel-title">
         <div class="act">
           <input th:if="${joinableSetForm.joinableSetId == null}" accesskey="s" disabled="disabled" id="create-joinableset-submit-button" type="submit" class="active" th:value="#{joinableset.button.add}">
           <input th:if="${joinableSetForm.joinableSetId != null}" accesskey="s" id="save-joinableset-submit-button" type="submit" class="active" th:value="#{joinableset.button.save}">
-          <a th:href="@{/deleteJoinableSet(joinableSetId=${joinableSetForm.joinableSetId})}" th:if="${joinableSetForm.joinableSetId != null}" accesskey="d" id="delete-joinableset-submit-button" type="submit" class="active" th:value="#{joinableset.button.delete}">Delete Joinable Set</a>
+          <a th:href="@{/deleteJoinableSet(joinableSetId=${joinableSetForm.joinableSetId})}" th:if="${joinableSetForm.joinableSetId != null}" accesskey="d" id="delete-joinableset-submit-button" type="submit" class="btn btn-default" th:value="#{joinableset.button.delete}">Delete Joinable Set</a>
           <a th:href="@{/}" accesskey="x" id="create-joinableset-cancel-button" class="btn btn-default" th:text="#{joinableset.button.cancel}">Cancel</a>
         </div>
         <div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" id="confirmation-modal">