home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Dmitriy Zaporozhets
2014-05-27 10:08:34 +00:00
parent f4889f50fc d7b3bbfc4a
commit b60226abf5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/sections/merge_requests.scss
+11 -4
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;
}
}
}
app/views/projects/merge_requests/_show.html.haml
+2
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)