diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-21 15:03:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-21 17:44:37 +0200 |
| commit | 17f5c4fce14cbe99226485da20d0a7feb001168c (patch) | |
| tree | e3e06039718b467e8a64a00b7036b9a4958671bd | |
| parent | f5f8a605c8a1508eb22fb67aeb635d140b90ef8f (diff) | |
| download | gitlab-ce-17f5c4fce14cbe99226485da20d0a7feb001168c.tar.gz | |
Merge branch 'compare-ellipsis-line' into 'master'
Fixed compare ellipsis messing with layout
## What does this MR do?
Fixed a bug where the ellipsis would cause the form to mess with the layout.
## Screenshots (if relevant)
See merge request !7042
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index 76b68c544aa..7bde20c3286 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -10,7 +10,7 @@ = button_tag type: 'button', class: "form-control compare-dropdown-toggle js-compare-dropdown", required: true, data: { refs_url: refs_namespace_project_path(@project.namespace, @project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do .dropdown-toggle-text= params[:from] || 'Select branch/tag' = render "ref_dropdown" - .compare-ellipsis ... + .compare-ellipsis.inline ... .form-group.dropdown.compare-form-group.to.js-compare-to-dropdown .input-group.inline-input-group %span.input-group-addon to |