diff options
| author | tauriedavis <taurie@gitlab.com> | 2017-06-07 00:31:47 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-08 16:48:59 +0300 |
| commit | b4c6dc1d813e179f87678116ed7625311af78c4d (patch) | |
| tree | b37453ca2ef52e93fff8b713c928b816a72101b8 /app | |
| parent | b4056e1b0d481c079caa216595412664453df1f2 (diff) | |
fixes project_group_links spec by adding click tab event
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/members.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/project_members/_index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/project_members/_new_shared_group.html.haml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index 5c81de87f69..4be0e133b69 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -13,6 +13,7 @@ &.active { background: $white-light; } + &:first-child { border-right: 1px solid $border-color; } diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml index 1a595a94eab..cfae371e169 100644 --- a/app/views/projects/project_members/_index.html.haml +++ b/app/views/projects/project_members/_index.html.haml @@ -18,10 +18,10 @@ - if can?(current_user, :admin_project_member, @project) %ul.nav-links.project-member-tabs{ role: 'tablist' } %li.active{ role: 'presentation' } - %a{ href: '#add-member-pane', data: { toggle: 'tab' }, role: 'tab' } Add member + %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member - if @project.allowed_to_share_with_group? %li{ role: 'presentation' } - %a{ href: '#share-with-group-pane', data: { toggle: 'tab' }, role: 'tab' } Share with group + %a{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group .tab-content.project-member-tab-content .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' } diff --git a/app/views/projects/project_members/_new_shared_group.html.haml b/app/views/projects/project_members/_new_shared_group.html.haml index a9637afad65..b7cc8dd7062 100644 --- a/app/views/projects/project_members/_new_shared_group.html.haml +++ b/app/views/projects/project_members/_new_shared_group.html.haml @@ -17,4 +17,4 @@ .clearable-input = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: 'Expiration date', id: 'expires_at_groups' %i.clear-icon.js-clear-input - = submit_tag "Share", class: "btn btn-create"
\ No newline at end of file + = submit_tag "Share", class: "btn btn-create" |