Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1e832a3a
Commit
1e832a3a
authored
Sep 08, 2017
by
Jedidiah
Committed by
Sean McGivern
Sep 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak column widths on two factor warning messages
parent
fadc58c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
app/views/u2f/_register.html.haml
app/views/u2f/_register.html.haml
+6
-6
changelogs/unreleased/uipolish-fix-2factor-warning.yml
changelogs/unreleased/uipolish-fix-2factor-warning.yml
+5
-0
No files found.
app/views/u2f/_register.html.haml
View file @
1e832a3a
...
...
@@ -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"
}
...
...
changelogs/unreleased/uipolish-fix-2factor-warning.yml
0 → 100644
View file @
1e832a3a
---
title
:
Two factor auth messages in settings no longer overlap the button
merge_request
:
author
:
Jedidiah Broadbent
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment