diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-29 21:26:09 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-30 15:23:39 -0400 |
| commit | 04c2c88b67956a01f3f0c59341862a33239726a2 (patch) | |
| tree | 9f7275aef0048c3030e05885afe800c50b7bbcd6 | |
| parent | eb7356a4f052ee4c092a1e48adf9af6c0f7ba4a2 (diff) | |
| download | gitlab-ce-04c2c88b67956a01f3f0c59341862a33239726a2.tar.gz | |
Merge branch 'commit-avatar-alignment' into 'master'
Fixed comit avatar alignment
## What does this MR do?
Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG
Also fixes potential issues in other places.
## Screenshots (if relevant)
See merge request !4933
(cherry picked from commit 8cada02d49090267576f6b0aa82e790368e0d7ae)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG index 05978729d89..d6a940123ba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.9.4 - Resolve "Sub nav isn't showing on file view". !4890 - Fixes middle click and double request when navigating through the file browser. !4891 - Fixed URL on label button when filtering. !4897 + - Fixed commit avatar alignment. !4933 v 8.9.3 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index de534d28421..85bbf70e188 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -83,11 +83,7 @@ position: relative; @media (min-width: $screen-sm-min) { - padding-left: 20px; - - .commit-info-block { - padding-left: 44px; - } + padding-left: 46px; } &:not(:last-child) { @@ -102,9 +98,7 @@ .avatar { - position: absolute; - top: 10px; - left: 16px; + margin-left: -46px; } .item-title { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 99c9e81ddb9..5b61270daa8 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -101,7 +101,8 @@ margin: 0; .commit { - padding: 0 0 0 55px; + padding-top: 0; + padding-bottom: 0; .commit-row-title { .commit-row-message { |