From d7b3bbfc4ab9d128f0d9c4734b3a7bebbc5d6eef Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 27 May 2014 12:06:31 +0300
Subject: [PATCH] Make MR dicussion and changes tabs more noticable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
.../stylesheets/sections/merge_requests.scss | 15 +++++++++++----
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 2d9a5e4bbe6b0..cac4cb66aa415 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 0166b988e580e..cbb8c83e4d056 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)
--
GitLab