diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-21 15:03:39 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-21 15:03:39 +0000 |
| commit | 0ba365f745d3be3b02c6297ec72b60aa467e3f9a (patch) | |
| tree | b51f8a165a0b260d390519b9aa5894d7a2037ddf | |
| parent | 434ad2b9274869660e61383c0b461fd333cbc6f7 (diff) | |
| parent | a74dfa301e77752e333467892073811677e82c89 (diff) | |
| download | gitlab-ce-0ba365f745d3be3b02c6297ec72b60aa467e3f9a.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 |