Commit 7783f443 authored by Peter Hegman's avatar Peter Hegman Committed by Olena Horal-Koretska

Convert OAuth2 authorization panel to GitLab UI utility classes

Remove `modal-*` CSS classes.
Increases size of header as a side-effect of refactor.

Changelog: changed
parent 62f792e3
...@@ -293,10 +293,8 @@ ...@@ -293,10 +293,8 @@
} }
} }
.modal-doorkeepr-auth { .doorkeeper-authorize {
.modal-body { max-width: px-to-rem(500px);
padding: $gl-padding;
}
} }
.created-deploy-token-container { .created-deploy-token-container {
......
%main{ :role => "main" } %main{ :role => "main" }
.modal-dialog.modal-doorkeepr-auth .doorkeeper-authorize.gl-mx-auto.gl-mt-6
.modal-content.gl-shadow-none .gl-border-gray-200.gl-border-1.gl-border-solid.gl-rounded-base
.modal-header .gl-p-5.gl-border-b-gray-200.gl-border-b-1.gl-border-b-solid
%h3.page-title %h4.gl-m-0
- link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer') - link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer')
= _("Authorize %{link_to_client} to use your account?").html_safe % { link_to_client: link_to_client } = _("Authorize %{link_to_client} to use your account?").html_safe % { link_to_client: link_to_client }
.modal-body .gl-p-5
- if current_user.admin? - if current_user.admin?
.text-warning .gl-text-orange-500
%p %p
= sprite_icon('warning-solid') = sprite_icon('warning-solid')
= html_escape(_('You are an admin, which means granting access to %{client_name} will allow them to interact with GitLab as an admin as well. Proceed with caution.')) % { client_name: tag.strong(@pre_auth.client.name) } = html_escape(_('You are an admin, which means granting access to %{client_name} will allow them to interact with GitLab as an admin as well. Proceed with caution.')) % { client_name: tag.strong(@pre_auth.client.name) }
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
- @pre_auth.scopes.each do |scope| - @pre_auth.scopes.each do |scope|
%li %li
%strong= t scope, scope: [:doorkeeper, :scopes] %strong= t scope, scope: [:doorkeeper, :scopes]
.text-secondary= t scope, scope: [:doorkeeper, :scope_desc] .gl-text-gray-500= t scope, scope: [:doorkeeper, :scope_desc]
.form-actions.text-right .gl-p-5.gl-bg-gray-10.gl-border-t-gray-200.gl-border-t-1.gl-border-t-solid.gl-rounded-bottom-right-base.gl-rounded-bottom-left-base.gl-text-right
= form_tag oauth_authorization_path, method: :delete, class: 'inline' do = form_tag oauth_authorization_path, method: :delete, class: 'inline' do
= hidden_field_tag :client_id, @pre_auth.client.uid = hidden_field_tag :client_id, @pre_auth.client.uid
= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
= hidden_field_tag :nonce, @pre_auth.nonce = hidden_field_tag :nonce, @pre_auth.nonce
= hidden_field_tag :code_challenge, @pre_auth.code_challenge = hidden_field_tag :code_challenge, @pre_auth.code_challenge
= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method = hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method
= submit_tag _("Deny"), class: "gl-button btn btn-danger" = submit_tag _("Deny"), class: "btn btn-default gl-button"
= form_tag oauth_authorization_path, method: :post, class: 'inline' do = form_tag oauth_authorization_path, method: :post, class: 'inline' do
= hidden_field_tag :client_id, @pre_auth.client.uid = hidden_field_tag :client_id, @pre_auth.client.uid
= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri = hidden_field_tag :redirect_uri, @pre_auth.redirect_uri
...@@ -48,4 +48,4 @@ ...@@ -48,4 +48,4 @@
= hidden_field_tag :nonce, @pre_auth.nonce = hidden_field_tag :nonce, @pre_auth.nonce
= hidden_field_tag :code_challenge, @pre_auth.code_challenge = hidden_field_tag :code_challenge, @pre_auth.code_challenge
= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method = hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method
= submit_tag _("Authorize"), class: "gl-button btn btn-confirm gl-ml-3", data: { qa_selector: 'authorization_button' } = submit_tag _("Authorize"), class: "btn btn-danger gl-button gl-ml-3", data: { qa_selector: 'authorization_button' }
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