Merge branch '26504-mr-discussion-btn' into 'master'

26504 Fix styling of MR jump to discussion button

Closes #26504

See merge request !8511

app/assets/stylesheets/framework/sidebar.scss

@@ -183,9 +183,11 @@
 
   &.right-sidebar-expanded {
     .line-resolve-all-container {
+      @media (min-width: $sidebar-breakpoint) {
         display: none;
       }
     }
+  }
 }
 
 header.header-sidebar-pinned {

app/assets/stylesheets/pages/notes.scss

@@ -526,8 +526,9 @@ ul.notes {
 }
 
 .line-resolve-all {
+  vertical-align: middle;
   display: inline-block;
-  padding: 5px 10px;
+  padding: 6px 10px;
   background-color: $gray-light;
   border: 1px solid $border-color;
   border-radius: $border-radius-default;
@@ -535,18 +536,14 @@ ul.notes {
   &.has-next-btn {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
+    border-right: 0;
   }
 
   .line-resolve-btn {
-    vertical-align: middle;
     margin-right: 5px;
   }
 }
 
-.line-resolve-text {
-  vertical-align: middle;
-}
-
 .line-resolve-btn {
   display: inline-block;
   position: relative;

changelogs/unreleased/26504-mr-discussion-btn.yml

+---
+title: 26504 Fix styling of MR jump to discussion button
+merge_request:
+author: