Download as
Browse Code »

Commit 341b4414ea0e0b289089f1895e61e0c14051f4d9

Authored by Dmitriy Zaporozhets
1 parent 2ec12c9b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

styled title block for mr, issue, commit

Showing 4 changed files with 12 additions and 5 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @341b441
@@ -57,6 +57,13 @@ a:focus { @@ -57,6 +57,13 @@ a:focus {
57 color: #777; 57 color: #777;
58 border: 1px solid #DEDFE1; 58 border: 1px solid #DEDFE1;
59 59
  60 + &.branch {
  61 + border:none;
  62 + font-size:13px;
  63 + background: #474D57;
  64 + color:#fff;
  65 + font-family: monospace;
  66 + }
60 } 67 }
61 68
62 .tabs > li > a, .pills > li > a { 69 .tabs > li > a, .pills > li > a {
app/views/commits/show.html.haml
  Diff comments   View file @341b441
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm") 13 %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
14 14
15 %br 15 %br
16 -%pre.commit_message 16 +%pre.commit_message.prettyprint
17 = commit_msg_with_link_to_issues(@project, @commit.safe_message) 17 = commit_msg_with_link_to_issues(@project, @commit.safe_message)
18 .clear 18 .clear
19 %br 19 %br
app/views/issues/show.html.haml
  Diff comments   View file @341b441
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 .alert-message.success Open 31 .alert-message.success Open
32 32
33 33
34 -%div.well 34 +%div.well.prettyprint
35 %div 35 %div
36 %cite.cgray Created by 36 %cite.cgray Created by
37 = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" 37 = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
app/views/merge_requests/show.html.haml
  Diff comments   View file @341b441
1 %h3 1 %h3
2 = "Merge Request ##{@merge_request.id}:" 2 = "Merge Request ##{@merge_request.id}:"
3   3  
4 - %span.label= @merge_request.source_branch 4 + %span.pretty_label.branch= @merge_request.source_branch
5 → 5 →
6 - %span.label= @merge_request.target_branch 6 + %span.pretty_label.branch= @merge_request.target_branch
7 7
8 %small 8 %small
9 created at 9 created at
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 46
47 = render "merge_requests/how_to_merge" 47 = render "merge_requests/how_to_merge"
48 48
49 -%div.well 49 +%div.well.prettyprint
50 %div 50 %div
51 %cite.cgray Created by 51 %cite.cgray Created by
52 = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av" 52 = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"