Merge branch '35468-fixdetail-margins' into 'master'

Fixes for inconsistent margins in project detail.

See merge request gitlab-org/gitlab!20395

app/assets/stylesheets/framework/wells.scss

@@ -3,7 +3,7 @@
   color: $gl-text-color;
   border: 1px solid $border-color;
   border-radius: $border-radius-default;
-  margin-bottom: $gl-padding;
+  margin-bottom: $gl-padding-8;
 
   .card.card-body-segment {
     padding: $gl-padding;

app/assets/stylesheets/pages/projects.scss

@@ -748,7 +748,7 @@
       display: inline-block;
 
       &:not(:last-child) {
-        margin-right: $gl-padding;
+        margin-right: $gl-padding-8;
       }
 
       &.right {
@@ -798,7 +798,7 @@
     }
 
     .btn {
-      margin-top: $gl-padding;
+      margin-top: $gl-padding-8;
       padding: $gl-btn-vert-padding $gl-btn-padding;
       line-height: $gl-btn-line-height;
 

app/assets/stylesheets/pages/tree.scss

 .tree-holder {
   .nav-block {
-    margin: 10px 0;
+    margin: 16px 0;
 
     .btn .fa,
     .btn svg {
@@ -15,8 +15,13 @@
       }
 
       .tree-controls {
+        display: flex;
         text-align: right;
 
+        .btn {
+          margin-left: 8px;
+        }
+
         .btn-group {
           margin-left: 10px;
         }

changelogs/unreleased/13768-fix-redo-icn.yml

+---
+title: Replacing incorrect icon for Retry in Pipeline list page
+merge_request: 20510
+author:
+type: changed

changelogs/unreleased/35468-fixdetail-margins.yml

+---
+title: Fixes to inconsistent margins/sapcing in the project detail page
+merge_request: 20395
+author:
+type: changed