kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make MR dicussion and changes tabs more noticable 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-05-27 12:06:31 +03:00
parent f4889f50fc
commit d7b3bbfc4a
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/stylesheets/sections/merge_requests.scss
View File

@ -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;
}
}
}

2
app/views/projects/merge_requests/_show.html.haml
View File

@ -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)