summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-02-15 10:21:37 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-02-15 10:21:37 +0000
commit2764b6f43a99c65ae6766a28ee4b17fbc93f0a55 (patch)
treeea6fbff779c1253ba7304b301c789c46c67ba7a3
parent659ec83b845e85c27acf70764f95203aff2075ab (diff)
parent0314c97226c7363c522de36c23640cc1dea44c26 (diff)
downloadgitlab-ce-2764b6f43a99c65ae6766a28ee4b17fbc93f0a55.tar.gz
Merge branch '39607-fix-avatar--vertical-align' into 'master'
Resolve "CI status icon and avatar are not vertically aligned in MR list" Closes #39607 See merge request gitlab-org/gitlab-ce!17072
-rw-r--r--app/assets/stylesheets/framework/lists.scss2
-rw-r--r--changelogs/unreleased/39607-fix-avatar--vertical-align.yml5
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index dcd98cb522f..7e829826eba 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -255,8 +255,6 @@ ul.controls {
}
.author_link {
- display: inline-block;
-
.avatar-inline {
margin-left: 0;
margin-right: 0;
diff --git a/changelogs/unreleased/39607-fix-avatar--vertical-align.yml b/changelogs/unreleased/39607-fix-avatar--vertical-align.yml
new file mode 100644
index 00000000000..4d9fee12f04
--- /dev/null
+++ b/changelogs/unreleased/39607-fix-avatar--vertical-align.yml
@@ -0,0 +1,5 @@
+---
+title: "Fix user avatar's vertical align on the issues and merge requests pages"
+merge_request: 17072
+author: Laszlo Karpati
+type: fixed