diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-10 20:39:10 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-10 15:40:53 -0500 |
commit | 43d6c0beabe4b32e65d0f49f6e3213aeb5e3ff75 (patch) | |
tree | 8516a5aae299b84dbecb051040e6cdebec7e52bf | |
parent | 46e8efc2fbc43e60c5cdf034a5ae8116bad4fb19 (diff) | |
download | gitlab-ce-43d6c0beabe4b32e65d0f49f6e3213aeb5e3ff75.tar.gz |
Merge branch 'compare-avatar-alignment' into 'master'
Fix commit avatar alignment in compare view
Closes #19567
See merge request !5128
(cherry picked from commit df49492fc011bd74ebaa4cb82bd85252127859a0)
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 89b9e1566f7..85851f59518 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.9.6 - Fix log statements in import/export. !5129 + - Fix commit avatar alignment in compare view. !5128 - Fix broken migration in MySQL. !5005 v 8.9.5 diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index a12c0bba44a..38a9f4e1149 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -166,6 +166,12 @@ ul.content-list { .panel > .content-list > li { padding: $gl-padding-top $gl-padding; + + &.commit { + @media (min-width: $screen-sm-min) { + padding-left: 46px + $gl-padding; + } + } } ul.controls { |