Commit 3349e612 authored by Phil Hughes's avatar Phil Hughes

Merge branch '231221-convert-saml-butons-to-gl' into 'master'

Convert group saml buttons to gl-button styles

See merge request gitlab-org/gitlab!49852
parents 0d91ee07 39081051
- scim_token_not_present = @scim_token_url.nil? - scim_token_not_present = @scim_token_url.nil?
.gl-mt-3.js-generate-scim-token-container{ class: "#{ 'd-none' unless scim_token_not_present}" } .gl-mt-3.js-generate-scim-token-container{ class: "#{ 'd-none' unless scim_token_not_present}" }
%p= s_('GroupSAML|Generate a SCIM token to set up your System for Cross-Domain Identity Management.') %p= s_('GroupSAML|Generate a SCIM token to set up your System for Cross-Domain Identity Management.')
%button.btn.btn_default.btn-white.js-generate-scim-token{ type: 'button' } %button.btn.gl-button.js-generate-scim-token{ type: 'button' }
= s_('GroupSAML|Generate a SCIM token') = s_('GroupSAML|Generate a SCIM token')
.gl-mt-3.js-scim-token-container{ class: "#{ 'd-none' if scim_token_not_present}" } .gl-mt-3.js-scim-token-container{ class: "#{ 'd-none' if scim_token_not_present}" }
.well-segment.borderless.mb-3.col-12.col-lg-9.p-0 .well-segment.borderless.mb-3.col-12.col-lg-9.p-0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.form-text.text-muted.js-scim-token-helper-text .form-text.text-muted.js-scim-token-helper-text
%span %span
= s_('GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to ') = s_('GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to ')
%button.btn.btn-default.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' } %button.btn.gl-button.btn-primary.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' }
= _('reset it.') = _('reset it.')
%span.d-none %span.d-none
= s_("GroupSAML|Make sure you save this token — you won't be able to access it again.") = s_("GroupSAML|Make sure you save this token — you won't be able to access it again.")
......
---
title: Convert group saml buttons to gl-button styles
merge_request: 49852
author:
type: other
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