Commit 6d6fb561 authored by Dimitrie Hoekstra's avatar Dimitrie Hoekstra Committed by Annabel Dunstone Gray

added various changes to commit title area

parent e4c05de7
...@@ -36,6 +36,42 @@ ...@@ -36,6 +36,42 @@
padding: 10px 0; padding: 10px 0;
margin-bottom: 0; margin-bottom: 0;
.commitable-meta {
display: inline-block;
line-height: 18px;
}
.commit-hash-full {
@media (max-width: $screen-md-min) {
width: 80px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: bottom;
}
}
.commitable-actions {
@media (min-width: $screen-sm) {
float: right;
padding-top: 0;
}
.dropdown{
@media (max-width: $screen-sm) {
width: 100%;
margin-top: 10px;
}
}
.dropdown-toggle {
@media (max-width: $screen-sm) {
width: 100%;
}
}
}
.commit-options-dropdown-caret { .commit-options-dropdown-caret {
@media (max-width: $screen-sm) { @media (max-width: $screen-sm) {
margin-left: 0; margin-left: 0;
......
.commit-info-row.commit-info-row-header .commit-info-row.commit-info-row-header
%span.hidden-xs.hidden-sm Commit .commitable-meta
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace js-details-short" %strong Commit
= link_to("#", class: "js-details-expand hidden-xs hidden-sm") do %strong.monospace.js-details-short= @commit.short_id
%span.text-expander = link_to("#", class: "js-details-expand hidden-xs hidden-sm") do
\... %span.text-expander
%span.js-details-content.hide \...
= link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace hidden-xs hidden-sm" %span.js-details-content.hide
= clipboard_button(clipboard_text: @commit.id) %strong.monospace.commit-hash-full= @commit.id
%span.hidden-xs authored = clipboard_button(clipboard_text: @commit.id)
#{time_ago_with_tooltip(@commit.authored_date)} %span.hidden-xs authored
%span by #{time_ago_with_tooltip(@commit.authored_date)}
= author_avatar(@commit, size: 24) %span by
%strong = author_avatar(@commit, size: 24)
= commit_author_link(@commit, avatar: true, size: 24)
- if @commit.different_committer?
%span.light Committed by
%strong %strong
= commit_committer_link(@commit, avatar: true, size: 24) = commit_author_link(@commit, avatar: true, size: 24)
#{time_ago_with_tooltip(@commit.committed_date)} - if @commit.different_committer?
%span.light Committed by
.pull-right.commit-action-buttons %strong
- if defined?(@notes_count) && @notes_count > 0 = commit_committer_link(@commit, avatar: true, size: 24)
%span.btn.disabled.btn-grouped.hidden-xs.append-right-10 #{time_ago_with_tooltip(@commit.committed_date)}
= icon('comment') .commitable-actions
= @notes_count .commit-action-buttons
= link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-default append-right-10 hidden-xs hidden-sm" do - if defined?(@notes_count) && @notes_count > 0
Browse Files %span.btn.disabled.btn-grouped.hidden-xs.append-right-10
.dropdown.inline = icon('comment')
%a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } } = @notes_count
%span.hidden-xs Options = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-default append-right-10 hidden-xs hidden-sm" do
= icon('caret-down', class: ".commit-options-dropdown-caret") Browse Files
%ul.dropdown-menu.dropdown-menu-align-right .dropdown.inline
%li.visible-xs-block.visible-sm-block %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
= link_to namespace_project_tree_path(@project.namespace, @project, @commit) do %span Options
Browse Files = icon('caret-down', class: ".commit-options-dropdown-caret")
- unless @commit.has_been_reverted?(current_user) %ul.dropdown-menu.dropdown-menu-align-right
%li.visible-xs-block.visible-sm-block
= link_to namespace_project_tree_path(@project.namespace, @project, @commit) do
Browse Files
- unless @commit.has_been_reverted?(current_user)
%li.clearfix
= revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
%li.clearfix
= cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
%li.clearfix %li.clearfix
= revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false) = link_to "Tag", new_namespace_project_tag_path(@project.namespace, @project, ref: @commit)
%li.clearfix %li.divider
= cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false) %li.dropdown-header
%li.clearfix Download
= link_to "Tag", new_namespace_project_tag_path(@project.namespace, @project, ref: @commit) - unless @commit.parents.length > 1
%li.divider %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
%li.dropdown-header %li= link_to "Plain Diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
Download
- unless @commit.parents.length > 1
%li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
%li= link_to "Plain Diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
.commit-box .commit-box
%h3.commit-title %h3.commit-title
......
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