From 024427bff6536457e1365709bd15098ddab0e0e8 Mon Sep 17 00:00:00 2001 From: tauriedavis Date: Thu, 4 May 2017 15:17:16 -0700 Subject: [PATCH] 31689 Add default margin-top to user request table on project members page --- app/views/projects/group_links/_index.html.haml | 4 +--- app/views/projects/project_members/_index.html.haml | 2 +- app/views/shared/members/_requests.html.haml | 2 +- changelogs/unreleased/31689-request-access-spacing.yml | 4 ++++ 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/unreleased/31689-request-access-spacing.yml diff --git a/app/views/projects/group_links/_index.html.haml b/app/views/projects/group_links/_index.html.haml index b6116dbec41..debb0214d06 100644 --- a/app/views/projects/group_links/_index.html.haml +++ b/app/views/projects/group_links/_index.html.haml @@ -6,11 +6,9 @@ %p Projects can be stored in only one group at once. However you can share a project with other groups here. .col-lg-9 - %h5.prepend-top-0 - Set a group to share = form_tag namespace_project_group_links_path(@project.namespace, @project), class: 'js-requires-input', method: :post do .form-group - = label_tag :link_group_id, "Group", class: "label-light" + = label_tag :link_group_id, "Select a group to share with", class: "label-light" = groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, required: true) .form-group = label_tag :link_group_access, "Max access level", class: "label-light" diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml index f83521052ed..d080b6c83d4 100644 --- a/app/views/projects/project_members/_index.html.haml +++ b/app/views/projects/project_members/_index.html.haml @@ -18,7 +18,7 @@ = render "projects/project_members/new_project_member" = render 'shared/members/requests', membership_source: @project, requesters: @requesters - .append-bottom-default.clearfix + .clearfix %h5.member.existing-title Existing members and groups - if @group_links.any? diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml index 10050adfda5..92f6e7428ae 100644 --- a/app/views/shared/members/_requests.html.haml +++ b/app/views/shared/members/_requests.html.haml @@ -1,5 +1,5 @@ - if requesters.any? - .panel.panel-default + .panel.panel-default.prepend-top-default .panel-heading Users requesting access to %strong= membership_source.name diff --git a/changelogs/unreleased/31689-request-access-spacing.yml b/changelogs/unreleased/31689-request-access-spacing.yml new file mode 100644 index 00000000000..66076b44f46 --- /dev/null +++ b/changelogs/unreleased/31689-request-access-spacing.yml @@ -0,0 +1,4 @@ +--- +title: Add default margin-top to user request table on project members page +merge_request: +author: