Commit 459547c2 authored by Annabel Dunstone's avatar Annabel Dunstone

Align avatar and text within commit row

parent 8b2a2fc5
...@@ -80,9 +80,14 @@ ...@@ -80,9 +80,14 @@
.commit { .commit {
padding: 10px 0; padding: 10px 0;
position: relative;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
padding-left: 46px; padding-left: 20px;
.commit-info-block {
padding-left: 44px;
}
} }
&:not(:last-child) { &:not(:last-child) {
...@@ -95,8 +100,11 @@ ...@@ -95,8 +100,11 @@
vertical-align: baseline; vertical-align: baseline;
} }
.avatar { .avatar {
margin-left: -46px; position: absolute;
top: 10px;
left: 16px;
} }
.item-title { .item-title {
......
...@@ -10,29 +10,30 @@ ...@@ -10,29 +10,30 @@
= cache(cache_key) do = cache(cache_key) do
%li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" } %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }
= commit_author_avatar(commit, size: 36) = commit_author_avatar(commit, size: 36)
.commit-row-title .commit-info-block
%span.item-title .commit-row-title
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message" %span.item-title
%span.commit-row-message.visible-xs-inline = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
· %span.commit-row-message.visible-xs-inline
= commit.short_id ·
- if commit.status = commit.short_id
= render_commit_status(commit, cssclass: 'visible-xs-inline') - if commit.status
- if commit.description? = render_commit_status(commit, cssclass: 'visible-xs-inline')
%a.text-expander.hidden-xs.js-toggle-button ... - if commit.description?
%a.text-expander.hidden-xs.js-toggle-button ...
.commit-actions.hidden-xs .commit-actions.hidden-xs
- if commit.status - if commit.status
= render_commit_status(commit, cssclass: 'btn btn-transparent') = render_commit_status(commit, cssclass: 'btn btn-transparent')
= clipboard_button_with_class({ clipboard_text: commit.id }, css_class: 'btn-transparent') = clipboard_button_with_class({ clipboard_text: commit.id }, css_class: 'btn-transparent')
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent" = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
= link_to_browse_code(project, commit) = link_to_browse_code(project, commit)
- if commit.description? - if commit.description?
%pre.commit-row-description.js-toggle-content %pre.commit-row-description.js-toggle-content
= preserve(markdown(escape_once(commit.description), pipeline: :single_line, author: commit.author)) = preserve(markdown(escape_once(commit.description), pipeline: :single_line, author: commit.author))
.commit-row-info .commit-row-info
= commit_author_link(commit, avatar: false, size: 24) = commit_author_link(commit, avatar: false, size: 24)
authored authored
#{time_ago_with_tooltip(commit.committed_date)} #{time_ago_with_tooltip(commit.committed_date)}
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