Merge branch '35087-mr-status-misaligned' into 'master'

annabel · annabel · commit 651bf36cc5d4 · 2017-07-18T19:59:18.000Z
35087 Fix alignment of controls in mr issuable list

Closes #35087

See merge request !12890
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
@@ -236,6 +236,8 @@ ul.content-list {
 ul.controls {
   float: right;
   list-style: none;
+  display: flex;
+  align-items: center;
 
   .btn {
     padding: 10px 14px;
@@ -259,6 +261,12 @@ ul.controls {
       }
     }
   }
+
+  .issuable-pipeline-broken a,
+  .issuable-pipeline-status a,
+  .author_link {
+    display: flex;
+  }
 }
 
 ul.indent-list {
diff --git a/changelogs/unreleased/35087-mr-status-misaligned.yml b/changelogs/unreleased/35087-mr-status-misaligned.yml
@@ -0,0 +1,4 @@
+---
+title: Fix alignment of controls in mr issuable list
+merge_request:
+author:

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +title: Fix alignment of controls in mr issuable list
 +merge_request:
 +author: