diff --git a/app/assets/stylesheets/access_permissions/access_modal.scss b/app/assets/stylesheets/access_permissions/access_modal.scss
index e06c73fa7..cc859429a 100644
--- a/app/assets/stylesheets/access_permissions/access_modal.scss
+++ b/app/assets/stylesheets/access_permissions/access_modal.scss
@@ -1,12 +1,69 @@
#user_assignments_modal {
.modal-body {
max-height: 400px;
+ min-height: 250px;
overflow: auto;
+ padding-top: 0;
+ }
+
+ .member-item {
+ border-bottom: 1px solid $modal-header-border-color;
+
+ margin: 0 .5em;
+ padding: .5em;
+ }
+
+ .user-assignment-role .dropdown-toggle,
+ .user-assignment-remove .btn {
+ border-width: 0;
+ }
+
+ .new-member-item .user-assignment-role .dropdown-toggle {
+ border-width: 1px;
+ border-color: $color-volcano;
+ width: 200px;
+ }
+
+ .member-item,
+ .user-assignment-info,
+ .user-assignment-controls {
+ align-items: center;
+ display: flex;
+ }
+
+ .user-assignment-controls {
+ margin-left: auto;
+ }
+
+ .global-avatar-container {
+ margin-right: 1em;
+ }
+
+ .user-assignment-remove {
+ margin-left: 1em;
+ }
+
+ a {
+ color: $color-volcano;
+ }
+
+ .sci-checkbox-container {
+ margin-right: 1em;
}
.sci-input-container {
+ margin-top: 1em;
+
.fa-search {
color: $color-alto;
}
}
+
+ .user-assignments-description {
+ margin: 1em .5em;
+ }
+
+ hr {
+ margin: 1em 0;
+ }
}
diff --git a/app/assets/stylesheets/access_permissions/member.scss b/app/assets/stylesheets/access_permissions/member.scss
deleted file mode 100644
index 379cc9b5b..000000000
--- a/app/assets/stylesheets/access_permissions/member.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "constants";
-
-.member-item {
- border-bottom: .1rem solid $btn-default-border;
- margin: 10px 0;
- padding: 10px;
-
- &:last-child {
- border: 0;
- }
-}
diff --git a/app/views/access_permissions/experiments/modals/_edit_modal.html.erb b/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
index 84758c46f..fdd6c7f90 100644
--- a/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_edit_modal.html.erb
@@ -8,7 +8,7 @@
-
+
<%= t '.description' %>
diff --git a/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb b/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
index 6f0a5777c..d85e73e7f 100644
--- a/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
+++ b/app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
@@ -8,7 +8,7 @@
<%= t '.title', resource_name: my_module.name %>
-
+
<%= t '.description' %>
diff --git a/app/views/access_permissions/partials/_experiment_member_field.html.erb b/app/views/access_permissions/partials/_experiment_member_field.html.erb
index 1a6cb5a7a..fcbadc50a 100644
--- a/app/views/access_permissions/partials/_experiment_member_field.html.erb
+++ b/app/views/access_permissions/partials/_experiment_member_field.html.erb
@@ -7,24 +7,21 @@
<%= form_with(model: experiment_member, url: update_path, method: :put, remote: true, html: { class: 'row 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' %>
-
-
-
-
<%= current_assignee_name(user) %>
-
-
<%= user_assignment_resource_role_name(experiment_member, user, experiment) %>
+
+
+ <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
+
+
+ <%= current_assignee_name(user) %>
+
+ <%= user_assignment_resource_role_name(experiment_member, user, experiment) %>
+
<% unless user == current_user %>
-
- <%= f.select :user_role_id,
- options_for_select(user_roles_collection, selected: f.object.user_role&.id),
- {},
- class: 'form-control selectpicker',
- title: t('user_assignment.change_experiment_role'),
- data: { 'selected-text-format' => 'static' } %>
+
+
+ <%= f.select :user_role_id, options_for_select(user_roles_collection, selected: f.object.user_role.id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_experiment_role'), data: { 'selected-text-format' => 'static' } %>
+
<% end %>
<% end %>
diff --git a/app/views/access_permissions/partials/_my_module_member_field.html.erb b/app/views/access_permissions/partials/_my_module_member_field.html.erb
index d8f79367e..b40473c43 100644
--- a/app/views/access_permissions/partials/_my_module_member_field.html.erb
+++ b/app/views/access_permissions/partials/_my_module_member_field.html.erb
@@ -7,24 +7,21 @@
<%= form_with(model: my_module_member, url: update_path, method: :put, remote: true, html: { class: 'row 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' %>
-
-
-
-
<%= current_assignee_name(user) %>
-
-
<%= user_assignment_resource_role_name(my_module_member, user, my_module) %>
+
+
+ <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %>
+
+
+ <%= current_assignee_name(user) %>
+
+ <%= user_assignment_resource_role_name(my_module_member, user, my_module) %>
+
<% unless user == current_user %>
-
- <%= f.select :user_role_id,
- options_for_select(user_roles_collection, selected: f.object.user_role&.id),
- {},
- class: 'form-control selectpicker',
- title: t('user_assignment.change_my_module_role'),
- data: { 'selected-text-format' => 'static' } %>
+
+
+ <%= f.select :user_role_id, options_for_select(user_roles_collection, selected: f.object.user_role.id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_my_module_role'), data: { 'selected-text-format' => 'static' } %>
+
<% end %>
<% end %>
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 b7360bb23..a27baf878 100644
--- a/app/views/access_permissions/partials/_project_member_field.html.erb
+++ b/app/views/access_permissions/partials/_project_member_field.html.erb
@@ -7,30 +7,28 @@
<%= form_with(model: project_member, url: update_path, method: :put, remote: true, html: { class: 'row member-item', id: item_id, data: { action: 'replace-form autosave-form', object_type: :project } }) 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' %>
-
-
-
- <%= current_assignee_name(user) %>
-
- <%= user_assignment_resource_role_name(project_member, user, project) %>
+
+
+ <%= current_assignee_name(user) %>
+
+ <%= user_assignment_resource_role_name(project_member, user, project) %>
+
<% unless user == current_user %>
-
-
-
- <%= f.select :user_role_id, options_for_select(user_roles_collection, selected: f.object.user_role.id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
-
-
- <% unless project_member.last_project_owner? %>
- <%= link_to access_permissions_project_path(project, user_id: user), remote: true, method: :delete, class: 'btn btn-link', data: { action: 'remote-destroy', target: "##{item_id}" } do %>
-
- <%= t 'general.remove' %>
- <% end %>
+
+
+ <%= f.select :user_role_id, options_for_select(user_roles_collection, selected: f.object.user_role.id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
+
+
+ <% unless project_member.last_project_owner? %>
+ <%= link_to access_permissions_project_path(project, user_id: user), remote: true, method: :delete, class: 'btn btn-secondary', data: { action: 'remote-destroy', target: "##{item_id}" } do %>
+
+ <%= t 'general.remove' %>
<% end %>
-
+ <% end %>
<% end %>
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 be64f197d..4b5370df1 100644
--- a/app/views/access_permissions/partials/_user_assignment_field.html.erb
+++ b/app/views/access_permissions/partials/_user_assignment_field.html.erb
@@ -6,31 +6,32 @@
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]" %>
-
-