Commit 1063ebb1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Make MR dicussion and changes tabs more noticable


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 72460f5467a8
......@@ -19,6 +19,7 @@
}
}
.merge-request .nav-tabs{
.merge-request .merge-request-tabs{
border-color: #AAA;
li {
a {
......@@ -23,8 +24,14 @@
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;
}
}
}
......
......@@ -12,7 +12,8 @@
= 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
......@@ -15,7 +16,8 @@
%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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment