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 @@