diff options
| author | Jedidiah <hello@jedidiah.eu> | 2017-09-08 12:40:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-08 12:40:49 +0000 |
| commit | 1e832a3a755caa773ce4476dc84a40166b5b7d10 (patch) | |
| tree | 058cbe627bc79f00d390c1e2b5b63ed5bf607ef9 | |
| parent | fadc58c50d0fb8a883363139c66455ff158c5575 (diff) | |
| download | gitlab-ce-1e832a3a755caa773ce4476dc84a40166b5b7d10.tar.gz | |
Tweak column widths on two factor warning messages
| -rw-r--r-- | app/views/u2f/_register.html.haml | 12 | ||||
| -rw-r--r-- | changelogs/unreleased/uipolish-fix-2factor-warning.yml | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml index 093b2d82813..79e8f8d0e89 100644 --- a/app/views/u2f/_register.html.haml +++ b/app/views/u2f/_register.html.haml @@ -6,15 +6,15 @@ %script#js-register-u2f-setup{ type: "text/template" } - if current_user.two_factor_otp_enabled? .row.append-bottom-10 - .col-md-3 - %button#js-setup-u2f-device.btn.btn-info Setup new U2F device - .col-md-9 + .col-md-4 + %button#js-setup-u2f-device.btn.btn-info.btn-block Setup new U2F device + .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. - else .row.append-bottom-10 - .col-md-3 - %button#js-setup-u2f-device.btn.btn-info{ disabled: true } Setup new U2F device - .col-md-9 + .col-md-4 + %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true } Setup new U2F device + .col-md-8 %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" } diff --git a/changelogs/unreleased/uipolish-fix-2factor-warning.yml b/changelogs/unreleased/uipolish-fix-2factor-warning.yml new file mode 100644 index 00000000000..9f55207d309 --- /dev/null +++ b/changelogs/unreleased/uipolish-fix-2factor-warning.yml @@ -0,0 +1,5 @@ +--- +title: Two factor auth messages in settings no longer overlap the button +merge_request: +author: Jedidiah Broadbent +type: fixed |