diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-14 14:45:01 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-14 14:45:01 +0100 |
| commit | 42eab8348f225894f94f1edef1c3e5c3322c1b10 (patch) | |
| tree | 8cd94320d06e694d3d7dc7b8f50478f55a516464 | |
| parent | 4b964011cfd6861403726248574f5926edc5d495 (diff) | |
| download | gitlab-ce-mr-download-dropdown-alignment.tar.gz | |
Fixed alignment of download dropdownmr-download-dropdown-alignment
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index e71a154d1d5..2bc9def1ad5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,7 @@ v 8.9.0 (unreleased) - `git clone https://host/namespace/project` now works, in addition to using the `.git` suffix - Bump nokogiri to 1.6.8 - Use gitlab-shell v3.0.0 + - Fixed alignment of download dropdown in merge requests - Upgrade to jQuery 2 - Use Knapsack to evenly distribute tests across multiple nodes - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index c4df8bd504f..b60bbb7532e 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -17,11 +17,11 @@ = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do Check out branch - %span.dropdown + %span.dropdown.inline.prepend-left-5 %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} } Download as %span.caret - %ul.dropdown-menu + %ul.dropdown-menu.dropdown-menu-align-right %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) .normal |