From 9dc8f3d40c898910375ecdee4c89e09cdcdef5e7 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Wed, 23 Mar 2016 15:24:21 +0000 Subject: [PATCH] Merge branch 'dropdown-right-align' into 'master' Dropdown alignment Hopefully the JS will stop this happening in future as well! Closes #14386 ![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png) See merge request !3298 --- CHANGELOG | 5 ++++- app/views/projects/branches/index.html.haml | 2 +- app/views/projects/tags/_download.html.haml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 14b9ac0839..216928aefe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Please view this file on the master branch, on stable branches it's out of date. -v 8.6.2 (unreleased) +v 8.6.3 (unreleased) + +v 8.6.2 + - Fix dropdown alignment. !3298 v 8.6.1 - Add option to reload the schema before restoring a database backup. !2807 diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 7afea5a504..88266e2123 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -16,7 +16,7 @@ - else Name %b.caret - %ul.dropdown-menu + %ul.dropdown-menu.dropdown-menu-align-right %li = link_to namespace_project_branches_path(sort: nil) do Name diff --git a/app/views/projects/tags/_download.html.haml b/app/views/projects/tags/_download.html.haml index 667057ef2d..093d1d1bb0 100644 --- a/app/views/projects/tags/_download.html.haml +++ b/app/views/projects/tags/_download.html.haml @@ -6,7 +6,7 @@ %span.caret %span.sr-only Select Archive Format - %ul.col-xs-10.dropdown-menu{ role: 'menu' } + %ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' } %li = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow' do %i.fa.fa-download