Commit 67f0f020 authored by samdbeckham's avatar samdbeckham

Cleans up double classes and regex mishaps

- Removes double `btn` classes
- Fixes omniauth issues with regex matches
- Removes the accidental changes to the ee dir
parent e87b9ce2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.d-flex.justify-content-between.flex-wrap .d-flex.justify-content-between.flex-wrap
- providers.each do |provider| - providers.each do |provider|
- has_icon = provider_has_icon?(provider) - has_icon = provider_has_icon?(provider)
= link_to omniauth_authorize_path(:user, provider), method: :post, class: "btn d-flex align-items-center omniauth-gl-button btn text-left oauth-login mb-2 p-2 #{qa_class_for_provider(provider)}", id: "oauth-login-#{provider}" do = link_to omniauth_authorize_path(:user, provider), method: :post, class: "gl-button btn d-flex align-items-center omniauth-btn text-left oauth-login mb-2 p-2 #{qa_class_for_provider(provider)}", id: "oauth-login-#{provider}" do
- if has_icon - if has_icon
= provider_image_tag(provider) = provider_image_tag(provider)
%span.ml-2 %span.ml-2
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.d-flex.justify-content-between.flex-wrap .d-flex.justify-content-between.flex-wrap
- providers.each do |provider| - providers.each do |provider|
- has_icon = provider_has_icon?(provider) - has_icon = provider_has_icon?(provider)
= button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "btn d-flex align-items-center omniauth-gl-button btn text-left oauth-login #{qa_class_for_provider(provider)}" do = button_to omniauth_authorize_path(:user, provider), id: "oauth-login-#{provider}", class: "gl-button btn d-flex align-items-center omniauth-btn text-left oauth-login #{qa_class_for_provider(provider)}" do
- if has_icon - if has_icon
= provider_image_tag(provider) = provider_image_tag(provider)
%span %span
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true } %input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#application_id', title: _("Copy ID"), class: "btn gl-button btn btn-default") = clipboard_button(target: '#application_id', title: _("Copy ID"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Secret') = _('Secret')
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.input-group .input-group
%input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true } %input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true }
.input-group-append .input-group-append
= clipboard_button(target: '#secret', title: _("Copy secret"), class: "btn gl-button btn btn-default") = clipboard_button(target: '#secret', title: _("Copy secret"), class: "gl-button btn btn-default")
%tr %tr
%td %td
= _('Callback URL') = _('Callback URL')
......
...@@ -12,5 +12,5 @@ ...@@ -12,5 +12,5 @@
= link_to "paid products", "https://about.gitlab.com/pricing/", target: "_blank", rel: "noopener noreferrer nofollow" = link_to "paid products", "https://about.gitlab.com/pricing/", target: "_blank", rel: "noopener noreferrer nofollow"
You can try Ultimate for free without You can try Ultimate for free without
any obligation or payment details. any obligation or payment details.
= link_to new_trial_url, class: "gl-button btn btn-success" do = link_to new_trial_url, class: "btn btn-success" do
Start free trial Start free trial
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
.login-body .login-body
= form_tag(auth_smartcard_url, html: { 'aria-live' => 'assertive'}) do = form_tag(auth_smartcard_url, html: { 'aria-live' => 'assertive'}) do
.submit-container .submit-container
= submit_tag _('Login with smartcard'), class: 'gl-button btn btn-success' = submit_tag _('Login with smartcard'), class: 'btn btn-success'
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