diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-10-19 14:40:58 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-20 21:57:34 +0200 |
| commit | 57046eb0abf280594d6625db3429f13d45499c83 (patch) | |
| tree | 7e56d94e0d0a37b4c04e06cd17cf4351cfd3d3d1 /app/views/devise | |
| parent | 60eca5f7b5e38c09c8170682852c497c410a96ac (diff) | |
| download | gitlab-ce-57046eb0abf280594d6625db3429f13d45499c83.tar.gz | |
Ensure custom provider tab labels don't break layout.ldap-login-styles
(Also fix some issues for session views on small screens.)
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/sessions/two_factor.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index 0e865b807c1..fd77cdbee2e 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -10,7 +10,7 @@ = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: 'edit_user show-gl-field-errors' }) do |f| - resource_params = params[resource_name].presence || params = f.hidden_field :remember_me, value: resource_params.fetch(:remember_me, 0) - .form-group + %div = f.label 'Two-Factor Authentication code', name: :otp_attempt = f.text_field :otp_attempt, class: 'form-control', required: true, autofocus: true, autocomplete: 'off', title: 'This field is required.' %p.help-block.hint Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes. diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index a057f126c45..1e957f0935f 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -1,4 +1,4 @@ -%ul.new-session-tabs.nav-links.nav-tabs +%ul.new-session-tabs.nav-links.nav-tabs{ class: ('custom-provider-tabs' if form_based_providers.any?) } - if crowd_enabled? %li.active = link_to "Crowd", "#crowd", 'data-toggle' => 'tab' |