Download as
Browse Code »

Commit b60226abf5f6bb3ea672cfb12953a4ee357cc1c7

Authored by Dmitriy Zaporozhets
2 parents f4889f50 d7b3bbfc
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'improve-mr-tabs' into 'master' 

Improve merge request page UX

Increase Discussions and Changes tabs size. Added count of changes and comment to it

Before and after:

![Screenshot 2014-05-27 12.08.42](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/31fe70c9be/Screenshot_2014-05-27_12.08.42.png)
Showing 2 changed files with 13 additions and 4 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @b60226a
@@ -19,12 +19,19 @@ @@ -19,12 +19,19 @@
19 } 19 }
20 } 20 }
21 21
22 -.merge-request .nav-tabs{ 22 +.merge-request .merge-request-tabs{
  23 + border-color: #AAA;
23 li { 24 li {
24 a { 25 a {
25 - font-weight: bold;  
26 - padding: 8px 20px;  
27 - text-align: center; 26 + border-color: #AAA;
  27 + padding: 14px 40px;
  28 + font-size: 14px;
  29 + background-color: #F9F9F9;
  30 + }
  31 + &.active a {
  32 + border-color: #AAA;
  33 + border-bottom-color: #FFF;
  34 + background-color: #FFF;
28 } 35 }
29 } 36 }
30 } 37 }
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @b60226a
@@ -12,10 +12,12 @@ @@ -12,10 +12,12 @@
12 = link_to project_merge_request_path(@project, @merge_request) do 12 = link_to project_merge_request_path(@project, @merge_request) do
13 %i.icon-comment 13 %i.icon-comment
14 Discussion 14 Discussion
  15 + %span.badge= @merge_request.mr_and_commit_notes.count
15 %li.diffs-tab{data: {action: 'diffs'}} 16 %li.diffs-tab{data: {action: 'diffs'}}
16 = link_to diffs_project_merge_request_path(@project, @merge_request) do 17 = link_to diffs_project_merge_request_path(@project, @merge_request) do
17 %i.icon-list-alt 18 %i.icon-list-alt
18 Changes 19 Changes
  20 + %span.badge= @merge_request.diffs.size
19 21
20 - content_for :note_actions do 22 - content_for :note_actions do
21 - if can?(current_user, :modify_merge_request, @merge_request) 23 - if can?(current_user, :modify_merge_request, @merge_request)