diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 13:06:31 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 13:06:31 +0400 |
| commit | d7b3bbfc4ab9d128f0d9c4734b3a7bebbc5d6eef (patch) | |
| tree | dac61e12594a7dbb43960a39615f71f30e3f8bb3 | |
| parent | f4889f50fcd9ec8df9a1f44def25bb9ea384a3bf (diff) | |
Make MR dicussion and changes tabs more noticable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 15 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 2d9a5e4bbe6..cac4cb66aa4 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -19,12 +19,19 @@ } } -.merge-request .nav-tabs{ +.merge-request .merge-request-tabs{ + border-color: #AAA; li { a { - font-weight: bold; - padding: 8px 20px; - text-align: center; + border-color: #AAA; + padding: 14px 40px; + font-size: 14px; + background-color: #F9F9F9; + } + &.active a { + border-color: #AAA; + border-bottom-color: #FFF; + background-color: #FFF; } } } diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 0166b988e58..cbb8c83e4d0 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -12,10 +12,12 @@ = link_to project_merge_request_path(@project, @merge_request) do %i.icon-comment Discussion + %span.badge= @merge_request.mr_and_commit_notes.count %li.diffs-tab{data: {action: 'diffs'}} = link_to diffs_project_merge_request_path(@project, @merge_request) do %i.icon-list-alt Changes + %span.badge= @merge_request.diffs.size - content_for :note_actions do - if can?(current_user, :modify_merge_request, @merge_request) |