Commit 6975a8c3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Robert Speicher

Merge branch '18787-user-img-compare' into 'master'

Align avatar and commit content within commit row

## What does this MR do?
Aligns the user avatar on `Compare`

## What are the relevant issue numbers?
Closes #18787 

## Screenshots (if relevant)
<img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px">
<img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px">


See merge request !4764
parent ab38557c
......@@ -80,9 +80,14 @@
.commit {
padding: 10px 0;
position: relative;
@media (min-width: $screen-sm-min) {
padding-left: 46px;
padding-left: 20px;
.commit-info-block {
padding-left: 44px;
}
}
&:not(:last-child) {
......@@ -95,8 +100,11 @@
vertical-align: baseline;
}
.avatar {
margin-left: -46px;
position: absolute;
top: 10px;
left: 16px;
}
.item-title {
......
......@@ -10,6 +10,7 @@
= cache(cache_key) do
%li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }
= commit_author_avatar(commit, size: 36)
.commit-info-block
.commit-row-title
%span.item-title
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment