Commit e1176d9c authored by Miguel Rincon's avatar Miguel Rincon

Merge branch 'aregnery/update-invite-variant' into 'master'

Replace success with confim variant for invite button in groups and projects

See merge request gitlab-org/gitlab!81837
parents 81ae46c4 3f0c7a8e
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
<gl-button <gl-button
:disabled="submitDisabled" :disabled="submitDisabled"
:loading="isLoading" :loading="isLoading"
variant="success" variant="confirm"
data-qa-selector="invite_button" data-qa-selector="invite_button"
data-testid="invite-button" data-testid="invite-button"
@click="submit" @click="submit"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.gl-w-half.gl-xs-w-full .gl-w-half.gl-xs-w-full
.gl-display-flex.gl-flex-wrap.gl-justify-content-end.gl-mb-3 .gl-display-flex.gl-flex-wrap.gl-justify-content-end.gl-mb-3
.js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full', display_text: _('Invite a group') } } .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full', display_text: _('Invite a group') } }
.js-invite-members-trigger{ data: { variant: 'success', .js-invite-members-trigger{ data: { variant: 'confirm',
classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3',
trigger_source: 'group-members-page', trigger_source: 'group-members-page',
display_text: _('Invite members') } } display_text: _('Invite members') } }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite a group') } } .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite a group') } }
= render 'projects/invite_groups_modal', project: @project = render 'projects/invite_groups_modal', project: @project
- if can_admin_project_member?(@project) - if can_admin_project_member?(@project)
.js-invite-members-trigger{ data: { variant: 'success', .js-invite-members-trigger{ data: { variant: 'confirm',
classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3',
trigger_source: 'project-members-page', trigger_source: 'project-members-page',
display_text: _('Invite members') } } display_text: _('Invite members') } }
......
...@@ -351,7 +351,7 @@ export default { ...@@ -351,7 +351,7 @@ export default {
<gl-button <gl-button
:disabled="submitDisabled" :disabled="submitDisabled"
:loading="isLoading" :loading="isLoading"
variant="success" variant="confirm"
data-qa-selector="invite_button" data-qa-selector="invite_button"
data-testid="invite-button" data-testid="invite-button"
@click="checkOverage" @click="checkOverage"
...@@ -366,7 +366,7 @@ export default { ...@@ -366,7 +366,7 @@ export default {
<gl-button <gl-button
:disabled="submitDisabled" :disabled="submitDisabled"
:loading="isLoading" :loading="isLoading"
variant="success" variant="confirm"
data-qa-selector="invite_with_overage_button" data-qa-selector="invite_with_overage_button"
data-testid="invite-with-overage-button" data-testid="invite-with-overage-button"
@click="submit" @click="submit"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment