Merge branch 'fix-branches-dropdown-sort-alignment' into 'master'

Fix branches page dropdown sort alignment ## What does this MR do? Makes the dropdown sort top aligned with the other elements beside it ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves the UI ## What are the relevant issue numbers? Closes #20837 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-11_at_10.08.56_AM](/uploads/d446c65276d856f6257921c0e662d110/Screen_Shot_2016-08-11_at_10.08.56_AM.png) ![Screen_Shot_2016-08-11_at_10.08.55_AM__2_](/uploads/015f0ac263281275405b127cd19718b4/Screen_Shot_2016-08-11_at_10.08.55_AM__2_.png) After: ![Screen_Shot_2016-08-11_at_10.15.35_AM](/uploads/73a231d4e4d474b3cfbc6944ddd4f0e9/Screen_Shot_2016-08-11_at_10.15.35_AM.png) ![Screen_Shot_2016-08-11_at_10.08.36_AM__2_](/uploads/c5cda7911258766c02554f68ebd4bf82/Screen_Shot_2016-08-11_at_10.08.36_AM__2_.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5777

Merge branch 'fix-branches-dropdown-sort-alignment' into 'master'
84748c86 · Annabel Dunstone Gray · 64366209 · 71d55202 · 84748c86 · 84748c86
Commit 84748c86 authored Aug 29, 2016 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

nav.scss app/assets/stylesheets/framework/nav.scss +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.12.0 (unreleased)
  - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
  - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
  - Add hover color to emoji icon (ClemMakesApps)
+  - Fix branches page dropdown sort alignment (ClemMakesApps)
  - Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
  - Add `wiki_page_events` to project hook APIs (Ben Boeckel)
  - Remove Gitorious import

--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -161,6 +161,7 @@
    > .dropdown {
      margin-right: $gl-padding-top;
      display: inline-block;
+      vertical-align: top;

      &:last-child {
        margin-right: 0;