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 /app/assets/stylesheets | |
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:
![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
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 1 |
1 files changed, 1 insertions, 0 deletions
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; |