diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-16 21:11:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-16 21:11:03 +0300 |
| commit | 341b4414ea0e0b289089f1895e61e0c14051f4d9 (patch) | |
| tree | 380d8701f5c45914007a6c82a576cde8626fa60f | |
| parent | 2ec12c9bb81b28add0b1d7404822d8312ed08d77 (diff) | |
| download | gitlab-ce-341b4414ea0e0b289089f1895e61e0c14051f4d9.tar.gz | |
styled title block for mr, issue, commit
| -rw-r--r-- | app/assets/stylesheets/common.scss | 7 | ||||
| -rw-r--r-- | app/views/commits/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 6 |
4 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9b65d605cd3..03bfd1852a2 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -57,6 +57,13 @@ a:focus { color: #777; border: 1px solid #DEDFE1; + &.branch { + border:none; + font-size:13px; + background: #474D57; + color:#fff; + font-family: monospace; + } } .tabs > li > a, .pills > li > a { diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 8c81b862f62..9e633072d2e 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -13,7 +13,7 @@ %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm") %br -%pre.commit_message +%pre.commit_message.prettyprint = commit_msg_with_link_to_issues(@project, @commit.safe_message) .clear %br diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index ab0e82c6b98..a320a16f646 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -31,7 +31,7 @@ .alert-message.success Open -%div.well +%div.well.prettyprint %div %cite.cgray Created by = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index a72813a0ca9..e3ee5bc62c1 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -1,9 +1,9 @@ %h3 = "Merge Request ##{@merge_request.id}:" - %span.label= @merge_request.source_branch + %span.pretty_label.branch= @merge_request.source_branch → - %span.label= @merge_request.target_branch + %span.pretty_label.branch= @merge_request.target_branch %small created at @@ -46,7 +46,7 @@ = render "merge_requests/how_to_merge" -%div.well +%div.well.prettyprint %div %cite.cgray Created by = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av" |