Download as
Browse Code »

Commit f69049c282c60aa08a9abf67c3e3c2811abe84db

Authored by Dmitriy Zaporozhets
2 parents 34e33273 f6a67ef2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased 

Break up links with nested formating (rebased)
Showing 10 changed files with 33 additions and 41 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @f69049c
@@ -377,7 +377,6 @@ form { @@ -377,7 +377,6 @@ form {
377 min-height: 20px; 377 min-height: 20px;
378 border-bottom: 1px solid #eee; 378 border-bottom: 1px solid #eee;
379 border-bottom: 1px solid rgba(0, 0, 0, 0.05); 379 border-bottom: 1px solid rgba(0, 0, 0, 0.05);
380 - cursor:pointer;  
381 &.smoke { 380 &.smoke {
382 background-color:#f5f5f5; 381 background-color:#f5f5f5;
383 } 382 }
@@ -512,7 +511,8 @@ form { @@ -512,7 +511,8 @@ form {
512 .row_title { 511 .row_title {
513 font-weight:bold; 512 font-weight:bold;
514 color:#444; 513 color:#444;
515 - &:hover { 514 + &:hover {
  515 + color:#444;
516 text-decoration:underline; 516 text-decoration:underline;
517 } 517 }
518 } 518 }
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @f69049c
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 width:32px; 34 width:32px;
35 margin-top:4px; 35 margin-top:4px;
36 } 36 }
37 - p.row_title { 37 + .row_title {
38 padding:0px; 38 padding:0px;
39 padding-bottom:2px; 39 padding-bottom:2px;
40 } 40 }
app/views/commits/_commit.html.haml
  Diff comments   View file @f69049c
@@ -2,16 +2,15 @@ @@ -2,16 +2,15 @@
2 .browse_code_link_holder 2 .browse_code_link_holder
3 %p 3 %p
4 %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right" 4 %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
5 - = link_to project_commit_path(@project, :id => commit.id) do  
6 - %p  
7 - %code.left= commit.short_id  
8 - %strong.cgray= commit.author_name  
9 - –  
10 - = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16  
11 - %span.row_title= truncate(commit.title, :length => 50) 5 + %p
  6 + %code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
  7 + %strong.cgray= commit.author_name
  8 + –
  9 + = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
  10 + = link_to truncate(commit.title, :length => 50), project_commit_path(@project, :id => commit.id), :class => "row_title"
12 11
13 - %span.committed_ago  
14 - = time_ago_in_words(commit.committed_date)  
15 - ago  
16 -   12 + %span.committed_ago
  13 + = time_ago_in_words(commit.committed_date)
  14 + ago
  15 +  
17 16
app/views/events/_commit.html.haml
  Diff comments   View file @f69049c
1 - commit = CommitDecorator.decorate(commit) 1 - commit = CommitDecorator.decorate(commit)
2 %li.wll.commit 2 %li.wll.commit
3 - = link_to project_commit_path(project, :id => commit.id) do  
4 - %p  
5 - %code.left= commit.short_id  
6 - %strong.cgray= commit.author_name  
7 - –  
8 - = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16  
9 - %span.row_title= truncate(commit.title, :length => 50) rescue "--broken encoding" 3 + %p
  4 + %code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id)
  5 + %strong.cgray= commit.author_name
  6 + –
  7 + = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
  8 + = link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
10 9
app/views/issues/_show.html.haml
  Diff comments   View file @f69049c
@@ -24,8 +24,7 @@ @@ -24,8 +24,7 @@
24 - else 24 - else
25 = image_tag "no_avatar.png", :class => "avatar" 25 = image_tag "no_avatar.png", :class => "avatar"
26 26
27 - = link_to project_issue_path(issue.project, issue) do  
28 - %p.row_title= truncate(issue.title, :length => 100) 27 + %p= link_to truncate(issue.title, :length => 100), project_issue_path(issue.project, issue), :class => "row_title"
29 28
30 %span.update-author 29 %span.update-author
31 %small.cdark= "##{issue.id}" 30 %small.cdark= "##{issue.id}"
app/views/issues/show.html.haml
  Diff comments   View file @f69049c
@@ -46,9 +46,7 @@ @@ -46,9 +46,7 @@
46 - if @issue.milestone 46 - if @issue.milestone
47 - milestone = @issue.milestone 47 - milestone = @issue.milestone
48 %cite.cgray and attached to milestone 48 %cite.cgray and attached to milestone
49 - = link_to project_milestone_path(milestone.project, milestone) do  
50 - %strong  
51 - = truncate(milestone.title, :length => 20) 49 + %strong= link_to truncate(milestone.title, :length => 20), project_milestone_path(milestone.project, milestone)
52 50
53 .right 51 .right
54 - @issue.labels.each do |label| 52 - @issue.labels.each do |label|
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @f69049c
@@ -16,8 +16,7 @@ @@ -16,8 +16,7 @@
16 = merge_request.target_branch 16 = merge_request.target_branch
17 = image_tag gravatar_icon(merge_request.author_email), :class => "avatar" 17 = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
18 18
19 - = link_to project_merge_request_path(merge_request.project, merge_request) do  
20 - %p.row_title= truncate(merge_request.title, :length => 80) 19 + %p= link_to truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"
21 20
22 %span.update-author 21 %span.update-author
23 %small.cdark= "##{merge_request.id}" 22 %small.cdark= "##{merge_request.id}"
app/views/milestones/_milestone.html.haml
  Diff comments   View file @f69049c
@@ -6,14 +6,13 @@ @@ -6,14 +6,13 @@
6 = link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped" 6 = link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped"
7 - if can? current_user, :admin_milestone, milestone.project 7 - if can? current_user, :admin_milestone, milestone.project
8 = link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped" 8 = link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped"
9 - = link_to project_milestone_path(milestone.project, milestone) do  
10 - %h4.row_title  
11 - = truncate(milestone.title, :length => 100)  
12 - %small  
13 - = milestone.expires_at  
14 - %br  
15 - .progress.progress-success.span3  
16 - .bar{:style => "width: #{milestone.percent_complete}%;"} 9 + %h4
  10 + = link_to truncate(milestone.title, :length => 100), project_milestone_path(milestone.project, milestone), :class => "row_title"
  11 + %small
  12 + = milestone.expires_at
  13 + %br
  14 + .progress.progress-success.span3
  15 + .bar{:style => "width: #{milestone.percent_complete}%;"}
17 16
18 17
19   18  
app/views/milestones/show.html.haml
  Diff comments   View file @f69049c
@@ -50,8 +50,8 @@ @@ -50,8 +50,8 @@
50 %td 50 %td
51 = link_to [@project, issue] do 51 = link_to [@project, issue] do
52 %span.badge.badge-info ##{issue.id} 52 %span.badge.badge-info ##{issue.id}
53 - –  
54 - = truncate issue.title, :length => 60 53 + –
  54 + = link_to truncate(issue.title, :length => 60), [@project, issue]
55 %br 55 %br
56 = paginate @issues, :theme => "gitlab" 56 = paginate @issues, :theme => "gitlab"
57 57
app/views/refs/blame.html.haml
  Diff comments   View file @f69049c
@@ -32,9 +32,8 @@ @@ -32,9 +32,8 @@
32 = commit.author_name 32 = commit.author_name
33 %td.blame_commit 33 %td.blame_commit
34   34  
35 - = link_to project_commit_path(@project, :id => commit.id) do  
36 - %code= commit.short_id  
37 - %span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding" 35 + %code= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
  36 + = link_to truncate(commit.title, :length => 30), project_commit_path(@project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
38 %td.lines 37 %td.lines
39 = preserve do 38 = preserve do
40 %pre 39 %pre