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

Merge branch 'dropdown-right-align' into 'master'
384a82f1 · Jacob Schatz · a4fa5d3e · 57749022 · 384a82f1 · 384a82f1
Commit 384a82f1 authored Mar 23, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

index.html.haml app/views/projects/branches/index.html.haml +1 -1

_download.html.haml app/views/projects/tags/_download.html.haml +1 -1

No files found.
--- 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

--- 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