Merge branch '29189-discussion-button' into 'master'

Fix alignment of resolve discussion button

Closes #29189

See merge request !9865

app/assets/stylesheets/pages/notes.scss

@@ -384,7 +384,7 @@ ul.notes {
   top: 0;
 
   .note-action-button {
-    margin-left: 10px;
+    margin-left: 8px;
   }
 }
 
@@ -400,8 +400,7 @@ ul.notes {
 }
 
 .note-action-button {
-  display: inline-block;
-  margin-left: 0;
+  display: inline;
   line-height: 20px;
 
   @media (min-width: $screen-sm-min) {
@@ -540,7 +539,6 @@ ul.notes {
 }
 
 .line-resolve-btn {
-  display: inline-block;
   position: relative;
   top: 2px;
   padding: 0;
@@ -563,8 +561,9 @@ ul.notes {
   }
 
   svg {
-    position: relative;
     fill: $gray-darkest;
+    height: 15px;
+    width: 15px;
   }
 }
 

app/views/projects/notes/_note.html.haml

@@ -43,9 +43,7 @@
                   "inline-template" => true,
                   "ref" => "note_#{note.id}" }
 
-                .note-action-button
-                  = icon("spin spinner", "v-show" => "loading")
-                  %button.line-resolve-btn{ type: "button",
+                %button.note-action-button.line-resolve-btn{ type: "button",
                     class: ("is-disabled" unless can_resolve),
                     ":class" => "{ 'is-active': isResolved }",
                     ":aria-label" => "buttonText",
@@ -53,6 +51,7 @@
                     ":title" => "buttonText",
                     "v-show" => "!loading",
                     ":ref" => "'button'" }
+                  = icon("spin spinner", "v-show" => "loading")
 
                   = render "shared/icons/icon_status_success.svg"
 

changelogs/unreleased/29189-discussion-button.yml

+---
+title: Fix alignment of resolve button
+merge_request:
+author: