diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-25 21:35:03 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-25 21:35:03 +0000 |
| commit | 3ab40c5108781fdb4012e0b993aa6a28a8cc8194 (patch) | |
| tree | a6c72f62509125fb12aef50f29e91443b4811fac | |
| parent | ae5916567e90cb5392ff034ab7fc100abc80b61e (diff) | |
| parent | fa3ec9d44aa13adf170b45c882f0ad6698f7f7f0 (diff) | |
| download | gitlab-ce-3ab40c5108781fdb4012e0b993aa6a28a8cc8194.tar.gz | |
Merge branch 'fix-groups-sort-dropdown-alignment' into 'master'
Fix groups sort dropdown alignment
## What does this MR do?
Changes the dropdown located on the [explore groups page](https://gitlab.com/explore/groups) from left aligned to right aligned.
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
Keeps the UI consistent for dropdowns as they are right aligned on other pages
## What are the relevant issue numbers?
Closes #21296
## 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 !5963
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/explore/groups/index.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4da8845ad09..255581359ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.12.0 (unreleased) - Remove Gitorious import - Add Sentry logging to API calls - Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling) + - Fix groups sort dropdown alignment (ClemMakesApps) - Added tests for diff notes - Fix inline emoji text alignment (ClemMakesApps) - Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck) diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml index 57f6e7e0612..b8248a80a27 100644 --- a/app/views/explore/groups/index.html.haml +++ b/app/views/explore/groups/index.html.haml @@ -24,7 +24,7 @@ - else = sort_title_recently_created %b.caret - %ul.dropdown-menu + %ul.dropdown-menu.dropdown-menu-align-right %li = link_to explore_groups_path(sort: sort_value_recently_created) do = sort_title_recently_created |