BigW Consortium Gitlab

Commit 61902165 by Dmitriy Zaporozhets

Add small visual improvements to merge request version switch

parent dbd58dc4
...@@ -375,5 +375,9 @@ ...@@ -375,5 +375,9 @@
.mr-version-switch { .mr-version-switch {
background: $background-color; background: $background-color;
padding: $gl-btn-padding; padding: $gl-btn-padding;
border-bottom: 1px solid $border-color; color: $gl-placeholder-color;
a.btn-link {
color: $gl-dark-link-color;
}
} }
...@@ -10,15 +10,18 @@ ...@@ -10,15 +10,18 @@
- if latest_diff == @merge_request_diff - if latest_diff == @merge_request_diff
#{"latest"} #{"latest"}
- else - else
#{@merge_request_diff.base_commit.short_id}..#{@merge_request_diff.head_commit.short_id} #{@merge_request_diff.head_commit.short_id}
%span.caret %span.caret
%ul.dropdown-menu.dropdown-menu-selectable %ul.dropdown-menu.dropdown-menu-selectable
- @merge_request.merge_request_diffs.each do |merge_request_diff| - @merge_request.merge_request_diffs.each do |merge_request_diff|
%li %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 = 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 %strong.monospace
#{merge_request_diff.base_commit.short_id}..#{merge_request_diff.head_commit.short_id} #{merge_request_diff.head_commit.short_id}
%br %br
%small %small
= time_ago_with_tooltip(merge_request_diff.created_at) = 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}
Markdown is supported
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