diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-18 22:59:18 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-18 22:59:18 +0300 |
| commit | 651bf36cc5d485a7c136f93b21b97bc807dd2188 (patch) | |
| tree | f3141f172988e264860502ce94b22bfa35947321 | |
| parent | 3f50f6ca5b4f1e45eecdff588d3ac7f5935f6de8 (diff) | |
| parent | 7f2b7bcdcca3c691a8991dec5adc50c172429b86 (diff) | |
Merge branch '35087-mr-status-misaligned' into 'master'
35087 Fix alignment of controls in mr issuable list
Closes #35087
See merge request !12890
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/35087-mr-status-misaligned.yml | 4 |
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: |