Merge branch...

Merge branch '198562-merge-request-user-interface-encourages-accidentally-closing-the-request' into 'master'

De-emphasize "Comment and close" button

See merge request gitlab-org/gitlab!55075

app/assets/javascripts/notes/components/comment_form.vue

@@ -132,9 +132,6 @@ export default {
         noteable: this.noteableDisplayName,
       });
     },
-    buttonVariant() {
-      return this.isOpen ? 'warning' : 'default';
-    },
     actionButtonClassNames() {
       return {
         'btn-reopen': !this.isOpen,
@@ -422,8 +419,6 @@ export default {
               <gl-button
                 v-if="canToggleIssueState"
                 :loading="isToggleStateButtonLoading"
-                category="secondary"
-                :variant="buttonVariant"
                 :class="[actionButtonClassNames, 'btn-comment btn-comment-and-close']"
                 :disabled="isSubmitting"
                 data-testid="close-reopen-button"

app/assets/stylesheets/framework/buttons.scss

@@ -196,10 +196,6 @@
     @include btn-orange;
   }
 
-  &.btn-close {
-    @include btn-outline($white, $orange-500, $orange-500, $orange-50, $orange-600, $orange-600, $orange-100, $orange-700, $orange-700);
-  }
-
   &.btn-danger {
     @include btn-red;
   }

changelogs/unreleased/198562-merge-request-user-interface-encourages-accidentally-closing-the-r.yml

+---
+title: Deemphasize comment and close button
+merge_request: 55075
+author:
+type: other

spec/frontend/notes/components/comment_form_spec.js

@@ -474,16 +474,4 @@ describe('issue_comment_form component', () => {
       expect(findTextArea().exists()).toBe(false);
     });
   });
-
-  describe('close/reopen button variants', () => {
-    it.each([
-      [constants.OPENED, 'warning'],
-      [constants.REOPENED, 'warning'],
-      [constants.CLOSED, 'default'],
-    ])('when %s, the variant of the btn is %s', (state, expected) => {
-      mountComponent({ noteableData: { ...noteableDataMock, state } });
-
-      expect(findCloseReopenButton().props('variant')).toBe(expected);
-    });
-  });
 });