Commit 78ad60f2 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'uipolish-fix-2factor-warning' into 'master'

Tweak column widths on two factor warning messages

See merge request !14112
parents fadc58c5 1e832a3a
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
%script#js-register-u2f-setup{ type: "text/template" } %script#js-register-u2f-setup{ type: "text/template" }
- if current_user.two_factor_otp_enabled? - if current_user.two_factor_otp_enabled?
.row.append-bottom-10 .row.append-bottom-10
.col-md-3 .col-md-4
%button#js-setup-u2f-device.btn.btn-info Setup new U2F device %button#js-setup-u2f-device.btn.btn-info.btn-block Setup new U2F device
.col-md-9 .col-md-8
%p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left. %p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.
- else - else
.row.append-bottom-10 .row.append-bottom-10
.col-md-3 .col-md-4
%button#js-setup-u2f-device.btn.btn-info{ disabled: true } Setup new U2F device %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true } Setup new U2F device
.col-md-9 .col-md-8
%p.text-warning You need to register a two-factor authentication app before you can set up a U2F device. %p.text-warning You need to register a two-factor authentication app before you can set up a U2F device.
%script#js-register-u2f-in-progress{ type: "text/template" } %script#js-register-u2f-in-progress{ type: "text/template" }
......
---
title: Two factor auth messages in settings no longer overlap the button
merge_request:
author: Jedidiah Broadbent
type: fixed
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