diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-29 13:57:41 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-29 13:57:41 +0000 |
| commit | 84748c86ec83f9b2fab66197a0b808f8c0c2c49f (patch) | |
| tree | c92bf6481973eed8036d354e0646a374c18dc42a | |
| parent | 64366209ffe23aff467f707e85a10f8a5b4a39cd (diff) | |
| parent | 71d552029126b42de1191a68dd270b5491d849ea (diff) | |
| download | gitlab-ce-84748c86ec83f9b2fab66197a0b808f8c0c2c49f.tar.gz | |
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:
After:
## 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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d06fc24d40a..83a5d1727f3 100644 --- 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 diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index cf7cf125504..ef2fe844f94 100644 --- 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; |