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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
8288a0ef
Commit
8288a0ef
authored
May 29, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix email verification badge
parent
ff575b78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+1
-1
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-1
app/views/shared/_email_with_badge.html.haml
app/views/shared/_email_with_badge.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
8288a0ef
...
@@ -405,7 +405,7 @@ table.u2f-registrations {
...
@@ -405,7 +405,7 @@ table.u2f-registrations {
margin-right
:
$gl-padding
/
4
;
margin-right
:
$gl-padding
/
4
;
}
}
.
label
-verification-status
{
.
badge
-verification-status
{
border-width
:
1px
;
border-width
:
1px
;
border-style
:
solid
;
border-style
:
solid
;
...
...
app/views/profiles/emails/index.html.haml
View file @
8288a0ef
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
Your Public Email will be displayed on your public profile.
Your Public Email will be displayed on your public profile.
%li
%li
All email addresses will be used to identify your commits.
All email addresses will be used to identify your commits.
%ul
.
well
-list
%ul
.
content
-list
%li
%li
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
@primary_email
,
verified:
current_user
.
confirmed?
}
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
@primary_email
,
verified:
current_user
.
confirmed?
}
%span
.float-right
%span
.float-right
...
...
app/views/shared/_email_with_badge.html.haml
View file @
8288a0ef
-
css_classes
=
%w(
label label
-verification-status)
-
css_classes
=
%w(
badge badge
-verification-status)
-
css_classes
<<
(
verified
?
'verified'
:
'unverified'
)
-
css_classes
<<
(
verified
?
'verified'
:
'unverified'
)
-
text
=
verified
?
'Verified'
:
'Unverified'
-
text
=
verified
?
'Verified'
:
'Unverified'
...
...
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