Merge branch '4080-align-retry-btn' into 'master'

Align retry button with job title with new grid size

Closes #40342

See merge request gitlab-org/gitlab-ce!15462

app/assets/stylesheets/framework/common.scss

@@ -430,6 +430,7 @@ img.emoji {
 /** COMMON CLASSES **/
 .prepend-top-0 { margin-top: 0; }
 .prepend-top-5 { margin-top: 5px; }
+.prepend-top-8 { margin-top: $grid-size; }
 .prepend-top-10 { margin-top: 10px; }
 .prepend-top-15 { margin-top: 15px; }
 .prepend-top-default { margin-top: $gl-padding !important; }

app/views/projects/jobs/_sidebar.html.haml

@@ -4,7 +4,7 @@
   .sidebar-container
     .blocks-container
       .block
-        %strong.prepend-top-10
+        %strong.inline.prepend-top-8
           = @build.name
         - if can?(current_user, :update_build, @build) && @build.retryable?
           = link_to "Retry", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'js-retry-button pull-right btn btn-inverted-secondary btn-retry visible-md-block visible-lg-block', method: :post

changelogs/unreleased/4080-align-retry-btn.yml

+---
+title: Align retry button with job title with new grid size
+merge_request:
+author:
+type: fixed