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

Add small visual improvements to merge request version switch 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-07-27 11:27:06 +03:00
parent dbd58dc4bb
commit 6190216541
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/pages/merge_requests.scss
View File

@ -375,5 +375,9 @@
.mr-version-switch {
background: $background-color;
padding: $gl-btn-padding;
border-bottom: 1px solid $border-color;
color: $gl-placeholder-color;
a.btn-link {
color: $gl-dark-link-color;
}
}

9
app/views/projects/merge_requests/show/_versions.html.haml
View File

@ -10,15 +10,18 @@
- if latest_diff == @merge_request_diff
#{"latest"}
- else
#{@merge_request_diff.base_commit.short_id}..#{@merge_request_diff.head_commit.short_id}
#{@merge_request_diff.head_commit.short_id}
%span.caret
%ul.dropdown-menu.dropdown-menu-selectable
- @merge_request.merge_request_diffs.each do |merge_request_diff|
%li
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, diff_id: merge_request_diff.id), class: ('is-active' if merge_request_diff == @merge_request_diff) do
%strong.monospace
#{merge_request_diff.base_commit.short_id}..#{merge_request_diff.head_commit.short_id}
#{merge_request_diff.head_commit.short_id}
%br
%small
= time_ago_with_tooltip(merge_request_diff.created_at)
.pull-right
%span.monospace
git diff #{@merge_request_diff.base_commit.short_id}..#{@merge_request_diff.head_commit.short_id}