Commit 57e09676 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'djadmin-dast-button-variants' into 'master'

Update GlButton variants for DAST & On-demand scans

See merge request gitlab-org/gitlab!64888
parents 6fcdc773 8238c1e3
......@@ -19,7 +19,7 @@ export default {
variant: {
type: String,
required: false,
default: 'success',
default: 'confirm',
},
category: {
type: String,
......
......@@ -475,7 +475,7 @@ export default {
<div class="gl-mt-6 gl-pt-6">
<gl-button
type="submit"
variant="success"
variant="confirm"
class="js-no-auto-disable"
data-testid="on-demand-scan-submit-button"
:disabled="isSubmitButtonDisabled"
......@@ -484,7 +484,7 @@ export default {
{{ s__('OnDemandScans|Save and run scan') }}
</gl-button>
<gl-button
variant="success"
variant="confirm"
category="secondary"
data-testid="on-demand-scan-save-button"
:disabled="isSaveButtonDisabled"
......
......@@ -143,7 +143,7 @@ export default {
</p>
<gl-button
:href="newProfilePath"
variant="success"
variant="confirm"
category="secondary"
data-testid="create-profile-link"
>
......
......@@ -32,7 +32,7 @@ export default {
<gl-button
v-else-if="canEnable"
variant="success"
variant="confirm"
category="primary"
:href="feature.configuration_path"
data-testid="enable-button"
......
......@@ -235,7 +235,7 @@ export default {
</h2>
<gl-dropdown
:text="$options.i18n.newProfileDropdownLabel"
variant="success"
variant="confirm"
right
class="gl-ml-auto"
>
......
......@@ -167,7 +167,7 @@ export default {
<gl-button
v-if="!hasValidationPassed(profile.validationStatus)"
:disabled="!canValidateProfile(profile.validationStatus)"
variant="info"
variant="confirm"
category="tertiary"
size="small"
@click="setValidatingProfile(profile)"
......@@ -175,7 +175,7 @@ export default {
>
<gl-button
v-else
variant="info"
variant="confirm"
category="tertiary"
size="small"
@click="setRevokeValidationProfile(profile)"
......
......@@ -384,7 +384,7 @@ export default {
<gl-button
type="submit"
variant="success"
variant="confirm"
class="js-no-auto-disable"
data-testid="dast-scanner-profile-form-submit-button"
:disabled="isSubmitDisabled"
......
......@@ -414,7 +414,7 @@ export default {
<gl-button
:disabled="isPolicyProfile"
type="submit"
variant="success"
variant="confirm"
class="js-no-auto-disable"
data-testid="dast-site-profile-form-submit-button"
:loading="isLoading"
......
......@@ -71,7 +71,7 @@ export default {
text: s__('DastSiteValidation|Validate'),
attributes: [
{ disabled: this.hasErrors },
{ variant: 'success' },
{ variant: 'confirm' },
{ category: 'primary' },
{ 'data-testid': 'validate-dast-site-button' },
],
......@@ -230,7 +230,7 @@ export default {
:label="s__('DastSiteValidation|Step 2 - Add following text to the target site')"
>
<gl-button
variant="info"
variant="confirm"
category="secondary"
size="small"
icon="download"
......
......@@ -363,7 +363,7 @@ exports[`OnDemandScansScannerProfileSelector renders properly without profiles 1
</p>
<a
class="btn btn-success btn-md gl-button btn-success-secondary"
class="btn btn-confirm btn-md gl-button btn-confirm-secondary"
data-testid="create-profile-link"
href="/test/new/scanner/profile/path"
>
......
......@@ -363,7 +363,7 @@ exports[`OnDemandScansSiteProfileSelector renders properly without profiles 1`]
</p>
<a
class="btn btn-success btn-md gl-button btn-success-secondary"
class="btn btn-confirm btn-md gl-button btn-confirm-secondary"
data-testid="create-profile-link"
href="/test/new/site/profile/path"
>
......
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