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
e7aa8315
Commit
e7aa8315
authored
Jun 27, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added user avatar to header
Closes #18543
parent
a9dbd394
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
11 deletions
+30
-11
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-2
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+15
-6
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+11
-3
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
e7aa8315
...
@@ -20,7 +20,8 @@
...
@@ -20,7 +20,8 @@
}
}
.open
{
.open
{
.dropdown-menu
{
.dropdown-menu
,
.dropdown-menu-nav
{
display
:
block
;
display
:
block
;
}
}
...
@@ -66,7 +67,8 @@
...
@@ -66,7 +67,8 @@
}
}
}
}
.dropdown-menu
{
.dropdown-menu
,
.dropdown-menu-nav
{
display
:
none
;
display
:
none
;
position
:
absolute
;
position
:
absolute
;
top
:
100%
;
top
:
100%
;
...
...
app/assets/stylesheets/framework/header.scss
View file @
e7aa8315
...
@@ -60,7 +60,7 @@ header {
...
@@ -60,7 +60,7 @@ header {
margin
:
(
$header-height
-
28
)
/
2
0
;
margin
:
(
$header-height
-
28
)
/
2
0
;
margin-left
:
10px
;
margin-left
:
10px
;
height
:
28px
;
height
:
28px
;
width
:
28px
;
min-
width
:
28px
;
line-height
:
28px
;
line-height
:
28px
;
text-align
:
center
;
text-align
:
center
;
...
@@ -241,14 +241,23 @@ header {
...
@@ -241,14 +241,23 @@ header {
.navbar-collapse
{
.navbar-collapse
{
padding-left
:
5px
;
padding-left
:
5px
;
li
{
.nav
>
li
{
display
:
table-cell
;
display
:
table-cell
;
width
:
1%
;
width
:
1%
;
a
{
margin-left
:
8px
!
important
;
}
}
}
}
}
}
}
}
}
.header-user
{
.dropdown-menu-nav
{
width
:
140px
;
margin-top
:
-5px
;
}
}
.header-user-avatar
{
float
:
left
;
margin-right
:
5px
;
border-radius
:
50%
;
}
app/views/layouts/header/_default.html.haml
View file @
e7aa8315
...
@@ -38,9 +38,17 @@
...
@@ -38,9 +38,17 @@
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
=
icon
(
'tachometer fw'
)
%li
%li
.header-user.dropdown
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
=
icon
(
'sign-out'
)
=
image_tag
avatar_icon
(
current_user
,
26
),
width:
26
,
height:
26
,
class:
"header-user-avatar"
%span
.caret
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%li
=
link_to
"Profile"
,
current_user
%li
.divider
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
title:
'Sign out'
-
else
-
else
%li
%li
%div
%div
...
...
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