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
211cd7b8
Commit
211cd7b8
authored
Aug 24, 2020
by
Jiaan Louw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-user-secret with GitLab SVG incognito icon
parent
90b81bf9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-2
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/header.scss
View file @
211cd7b8
...
@@ -235,9 +235,8 @@
...
@@ -235,9 +235,8 @@
border-top-left-radius
:
0
;
border-top-left-radius
:
0
;
border-bottom-left-radius
:
0
;
border-bottom-left-radius
:
0
;
i
{
svg
{
color
:
$orange-500
;
color
:
$orange-500
;
font-size
:
20px
;
}
}
}
}
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
211cd7b8
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
-
if
has_impersonation_link
-
if
has_impersonation_link
%li
.nav-item.impersonation.ml-0
%li
.nav-item.impersonation.ml-0
=
link_to
admin_impersonation_path
,
class:
'nav-link impersonation-btn'
,
method: :delete
,
title:
_
(
'Stop impersonation'
),
aria:
{
label:
_
(
'Stop impersonation'
)
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
,
qa_selector:
'stop_impersonation_link'
}
do
=
link_to
admin_impersonation_path
,
class:
'nav-link impersonation-btn'
,
method: :delete
,
title:
_
(
'Stop impersonation'
),
aria:
{
label:
_
(
'Stop impersonation'
)
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
,
qa_selector:
'stop_impersonation_link'
}
do
=
icon
(
'user-secret'
)
=
sprite_icon
(
'incognito'
,
size:
18
)
-
if
header_link?
(
:sign_in
)
-
if
header_link?
(
:sign_in
)
%li
.nav-item
%li
.nav-item
%div
%div
...
...
spec/features/admin/admin_users_spec.rb
View file @
211cd7b8
...
@@ -353,7 +353,7 @@ RSpec.describe "Admin::Users" do
...
@@ -353,7 +353,7 @@ RSpec.describe "Admin::Users" do
it
'sees impersonation log out icon'
do
it
'sees impersonation log out icon'
do
subject
subject
icon
=
first
(
'
.fa.fa-user-secret
'
)
icon
=
first
(
'
[data-testid="incognito-icon"]
'
)
expect
(
icon
).
not_to
be
nil
expect
(
icon
).
not_to
be
nil
end
end
...
...
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