Merge branch '349761-restyle-integration-reset-button' into 'master'

Reposition and restyle integration reset button

See merge request gitlab-org/gitlab!77921

app/assets/javascripts/integrations/edit/components/integration_form.vue

@@ -216,7 +216,12 @@ export default {
           v-bind="propsSource.jiraIssuesProps"
           @request-jira-issue-types="onRequestJiraIssueTypes"
         />
-        <div v-if="isEditable" class="footer-block row-content-block">
+
+        <div
+          v-if="isEditable"
+          class="footer-block row-content-block gl-display-flex gl-justify-content-space-between"
+        >
+          <div>
             <template v-if="isInstanceOrGroupLevel">
               <gl-button
                 v-gl-modal.confirmSaveIntegration
@@ -257,21 +262,23 @@ export default {
               {{ __('Test settings') }}
             </gl-button>
 
+            <gl-button :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
+          </div>
+
           <template v-if="showResetButton">
             <gl-button
               v-gl-modal.confirmResetIntegration
-              category="secondary"
-              variant="confirm"
+              category="tertiary"
+              variant="danger"
               :loading="isResetting"
               :disabled="disableButtons"
               data-testid="reset-button"
             >
               {{ __('Reset') }}
             </gl-button>
+
             <reset-confirmation-modal @reset="onResetClick" />
           </template>
-
-          <gl-button :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
         </div>
       </div>
     </div>