summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-09-06 10:28:23 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-09-06 10:28:23 +0000
commit5857f0e57aa17c93ac871f08da7dbc7a4abe9b9f (patch)
tree030c6b6bd9a41b63325f710eb65398ce8e4ba4c7
parent0e0a4d78818c071ce89aec1619f1e6bc8c8a40af (diff)
parent288a42b5d80f07243e31f768cf86988a996abadc (diff)
downloadgitlab-ce-5857f0e57aa17c93ac871f08da7dbc7a4abe9b9f.tar.gz
Merge branch 'sh-add-margin-member-list' into 'master'
Add padding to left of "Sort by" in members dropdown See merge request gitlab-org/gitlab-ce!32602
-rw-r--r--app/views/shared/members/_sort_dropdown.html.haml2
-rw-r--r--changelogs/unreleased/sh-add-margin-member-list.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/members/_sort_dropdown.html.haml b/app/views/shared/members/_sort_dropdown.html.haml
index feca109dade..5f3d49adff7 100644
--- a/app/views/shared/members/_sort_dropdown.html.haml
+++ b/app/views/shared/members/_sort_dropdown.html.haml
@@ -1,4 +1,4 @@
-= label_tag :sort_by, 'Sort by', class: 'col-form-label label-bold pr-2'
+= label_tag :sort_by, 'Sort by', class: 'col-form-label label-bold px-2'
.dropdown.inline.qa-user-sort-dropdown
= dropdown_toggle(member_sort_options_hash[@sort], { toggle: 'dropdown' })
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
diff --git a/changelogs/unreleased/sh-add-margin-member-list.yml b/changelogs/unreleased/sh-add-margin-member-list.yml
new file mode 100644
index 00000000000..35d35aad8bf
--- /dev/null
+++ b/changelogs/unreleased/sh-add-margin-member-list.yml
@@ -0,0 +1,5 @@
+---
+title: Add padding to left of "Sort by" in members dropdown
+merge_request: 32602
+author:
+type: other