summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-07-14 16:04:01 -0700
committertauriedavis <taurie@gitlab.com>2017-07-17 11:15:24 -0700
commit7f2b7bcdcca3c691a8991dec5adc50c172429b86 (patch)
treea489a49e02e4c3ab87f528ed6529e3ec0ebdb207
parentd9dd621a11e11b917e0d19b01c6586777990b137 (diff)
downloadgitlab-ce-35087-mr-status-misaligned.tar.gz
35087 Fix alignment of controls in mr issuable list35087-mr-status-misaligned
-rw-r--r--app/assets/stylesheets/framework/lists.scss8
-rw-r--r--changelogs/unreleased/35087-mr-status-misaligned.yml4
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index e59cd0eea82..868e65a8f46 100644
--- 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
new file mode 100644
index 00000000000..3be43125a61
--- /dev/null
+++ b/changelogs/unreleased/35087-mr-status-misaligned.yml
@@ -0,0 +1,4 @@
+---
+title: Fix alignment of controls in mr issuable list
+merge_request:
+author: