Commit 3ab40c51 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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:
![Screen_Shot_2016-08-23_at_11.21.01_AM](/uploads/9723d0166b80dcb8d7b0228063e39a77/Screen_Shot_2016-08-23_at_11.21.01_AM.png)

After:
![Screen_Shot_2016-08-23_at_11.20.52_AM](/uploads/5a55a72c10909142d02a23710736a93f/Screen_Shot_2016-08-23_at_11.20.52_AM.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 !5963
parents ae591656 fa3ec9d4
...@@ -10,6 +10,7 @@ v 8.12.0 (unreleased) ...@@ -10,6 +10,7 @@ v 8.12.0 (unreleased)
- Remove Gitorious import - Remove Gitorious import
- Add Sentry logging to API calls - Add Sentry logging to API calls
- Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling) - Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling)
- Fix groups sort dropdown alignment (ClemMakesApps)
- Added tests for diff notes - Added tests for diff notes
- Fix inline emoji text alignment (ClemMakesApps) - Fix inline emoji text alignment (ClemMakesApps)
- Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck) - Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
- else - else
= sort_title_recently_created = sort_title_recently_created
%b.caret %b.caret
%ul.dropdown-menu %ul.dropdown-menu.dropdown-menu-align-right
%li %li
= link_to explore_groups_path(sort: sort_value_recently_created) do = link_to explore_groups_path(sort: sort_value_recently_created) do
= sort_title_recently_created = sort_title_recently_created
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment