Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
This commit is contained in:
commit
f69049c282
10 changed files with 33 additions and 41 deletions
app
assets/stylesheets
views
commits
events
issues
merge_requests
milestones
refs
|
@ -377,7 +377,6 @@ form {
|
||||||
min-height: 20px;
|
min-height: 20px;
|
||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
|
||||||
cursor:pointer;
|
|
||||||
&.smoke {
|
&.smoke {
|
||||||
background-color:#f5f5f5;
|
background-color:#f5f5f5;
|
||||||
}
|
}
|
||||||
|
@ -513,6 +512,7 @@ form {
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
color:#444;
|
color:#444;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
color:#444;
|
||||||
text-decoration:underline;
|
text-decoration:underline;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
width:32px;
|
width:32px;
|
||||||
margin-top:4px;
|
margin-top:4px;
|
||||||
}
|
}
|
||||||
p.row_title {
|
.row_title {
|
||||||
padding:0px;
|
padding:0px;
|
||||||
padding-bottom:2px;
|
padding-bottom:2px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,12 @@
|
||||||
.browse_code_link_holder
|
.browse_code_link_holder
|
||||||
%p
|
%p
|
||||||
%strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
|
%strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
|
||||||
= link_to project_commit_path(@project, :id => commit.id) do
|
|
||||||
%p
|
%p
|
||||||
%code.left= commit.short_id
|
%code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
|
||||||
%strong.cgray= commit.author_name
|
%strong.cgray= commit.author_name
|
||||||
–
|
–
|
||||||
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
||||||
%span.row_title= truncate(commit.title, :length => 50)
|
= link_to truncate(commit.title, :length => 50), project_commit_path(@project, :id => commit.id), :class => "row_title"
|
||||||
|
|
||||||
%span.committed_ago
|
%span.committed_ago
|
||||||
= time_ago_in_words(commit.committed_date)
|
= time_ago_in_words(commit.committed_date)
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
- commit = CommitDecorator.decorate(commit)
|
- commit = CommitDecorator.decorate(commit)
|
||||||
%li.wll.commit
|
%li.wll.commit
|
||||||
= link_to project_commit_path(project, :id => commit.id) do
|
|
||||||
%p
|
%p
|
||||||
%code.left= commit.short_id
|
%code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id)
|
||||||
%strong.cgray= commit.author_name
|
%strong.cgray= commit.author_name
|
||||||
–
|
–
|
||||||
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
= image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
|
||||||
%span.row_title= truncate(commit.title, :length => 50) rescue "--broken encoding"
|
= link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,7 @@
|
||||||
- else
|
- else
|
||||||
= image_tag "no_avatar.png", :class => "avatar"
|
= image_tag "no_avatar.png", :class => "avatar"
|
||||||
|
|
||||||
= link_to project_issue_path(issue.project, issue) do
|
%p= link_to truncate(issue.title, :length => 100), project_issue_path(issue.project, issue), :class => "row_title"
|
||||||
%p.row_title= truncate(issue.title, :length => 100)
|
|
||||||
|
|
||||||
%span.update-author
|
%span.update-author
|
||||||
%small.cdark= "##{issue.id}"
|
%small.cdark= "##{issue.id}"
|
||||||
|
|
|
@ -46,9 +46,7 @@
|
||||||
- if @issue.milestone
|
- if @issue.milestone
|
||||||
- milestone = @issue.milestone
|
- milestone = @issue.milestone
|
||||||
%cite.cgray and attached to milestone
|
%cite.cgray and attached to milestone
|
||||||
= link_to project_milestone_path(milestone.project, milestone) do
|
%strong= link_to truncate(milestone.title, :length => 20), project_milestone_path(milestone.project, milestone)
|
||||||
%strong
|
|
||||||
= truncate(milestone.title, :length => 20)
|
|
||||||
|
|
||||||
.right
|
.right
|
||||||
- @issue.labels.each do |label|
|
- @issue.labels.each do |label|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
= merge_request.target_branch
|
= merge_request.target_branch
|
||||||
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
|
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
|
||||||
|
|
||||||
= link_to project_merge_request_path(merge_request.project, merge_request) do
|
%p= link_to truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"
|
||||||
%p.row_title= truncate(merge_request.title, :length => 80)
|
|
||||||
|
|
||||||
%span.update-author
|
%span.update-author
|
||||||
%small.cdark= "##{merge_request.id}"
|
%small.cdark= "##{merge_request.id}"
|
||||||
|
|
|
@ -6,9 +6,8 @@
|
||||||
= link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped"
|
= link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped"
|
||||||
- if can? current_user, :admin_milestone, milestone.project
|
- if can? current_user, :admin_milestone, milestone.project
|
||||||
= link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped"
|
= link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped"
|
||||||
= link_to project_milestone_path(milestone.project, milestone) do
|
%h4
|
||||||
%h4.row_title
|
= link_to truncate(milestone.title, :length => 100), project_milestone_path(milestone.project, milestone), :class => "row_title"
|
||||||
= truncate(milestone.title, :length => 100)
|
|
||||||
%small
|
%small
|
||||||
= milestone.expires_at
|
= milestone.expires_at
|
||||||
%br
|
%br
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
= link_to [@project, issue] do
|
= link_to [@project, issue] do
|
||||||
%span.badge.badge-info ##{issue.id}
|
%span.badge.badge-info ##{issue.id}
|
||||||
–
|
–
|
||||||
= truncate issue.title, :length => 60
|
= link_to truncate(issue.title, :length => 60), [@project, issue]
|
||||||
%br
|
%br
|
||||||
= paginate @issues, :theme => "gitlab"
|
= paginate @issues, :theme => "gitlab"
|
||||||
|
|
||||||
|
|
|
@ -32,9 +32,8 @@
|
||||||
= commit.author_name
|
= commit.author_name
|
||||||
%td.blame_commit
|
%td.blame_commit
|
||||||
|
|
||||||
= link_to project_commit_path(@project, :id => commit.id) do
|
%code= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
|
||||||
%code= commit.short_id
|
= link_to truncate(commit.title, :length => 30), project_commit_path(@project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
|
||||||
%span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding"
|
|
||||||
%td.lines
|
%td.lines
|
||||||
= preserve do
|
= preserve do
|
||||||
%pre
|
%pre
|
||||||
|
|
Loading…
Add table
Reference in a new issue