diff --git a/app/assets/stylesheets/access_permissions/project.scss b/app/assets/stylesheets/access_permissions/project.scss new file mode 100644 index 000000000..0f9096a43 --- /dev/null +++ b/app/assets/stylesheets/access_permissions/project.scss @@ -0,0 +1,11 @@ +@import "constants"; + +.project-member-item { + border-bottom: .1rem solid $btn-default-border; + padding: 10px; + margin: 10px 0; + + &:last-child { + border: none; + } +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0ef24a308..42dd15d1e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -25,6 +25,7 @@ @import "emojionearea.min"; @import "ajax-bootstrap-select.min"; @import "extend/bootstrap"; +@import "access_permissions/*"; @import "extend/*"; @import "hooks/*"; @import "partials/*"; diff --git a/app/views/access_permissions/partials/_project_member_field.html.erb b/app/views/access_permissions/partials/_project_member_field.html.erb index 9b9008da5..2170602fd 100644 --- a/app/views/access_permissions/partials/_project_member_field.html.erb +++ b/app/views/access_permissions/partials/_project_member_field.html.erb @@ -5,13 +5,12 @@ item_id = dom_id(user, :project_member) %> -<%= form_with(model: project_member, url: update_path, method: :put, remote: true, html: { id: item_id, data: { action: 'replace-form autosave-form' } }) do |f| %> +<%= form_with(model: project_member, url: update_path, method: :put, remote: true, html: { class: 'row project-member-item', id: item_id, data: { action: 'replace-form autosave-form' } }) do |f| %> <%= f.hidden_field :user_id, value: f.object.user.id %> -
- - <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %> - + + <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %> +
<%= current_assignee_name(user) %> @@ -35,5 +34,4 @@
<% end %> - <% end %> diff --git a/app/views/access_permissions/partials/_user_assignment.html.erb b/app/views/access_permissions/partials/_user_assignment.html.erb index 9036ad0b5..b7074a802 100644 --- a/app/views/access_permissions/partials/_user_assignment.html.erb +++ b/app/views/access_permissions/partials/_user_assignment.html.erb @@ -1,6 +1,6 @@ <% # frozen_string_literal: true %> -
+
<%= image_tag avatar_path(user_assignment.user, :icon_small), title: current_assignee_name(user_assignment.user), class: 'img-circle pull-left' %> @@ -13,4 +13,3 @@ <%= user_assignment.user_role.name %>
- diff --git a/app/views/access_permissions/partials/_user_assignment_field.html.erb b/app/views/access_permissions/partials/_user_assignment_field.html.erb index 105f68ce1..b67f4aae1 100644 --- a/app/views/access_permissions/partials/_user_assignment_field.html.erb +++ b/app/views/access_permissions/partials/_user_assignment_field.html.erb @@ -6,7 +6,7 @@ id = dom_id(user, :new_project_member) %> -
+
<%= f.hidden_field :user_id, value: user.id, name:"access_permissions_new_user_project_form[resource_members][#{user.id}][user_id]" %>