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
iv
gitlab-ce
Commits
61a3cd63
Commit
61a3cd63
authored
Jun 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move logout buttom to top right corner
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
509fe115
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
18 deletions
+12
-18
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+1
-10
app/assets/stylesheets/themes/gitlab-theme.scss
app/assets/stylesheets/themes/gitlab-theme.scss
+6
-2
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+2
-6
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+3
-0
No files found.
app/assets/stylesheets/generic/sidebar.scss
View file @
61a3cd63
...
...
@@ -130,14 +130,6 @@
.username
{
display
:
none
;
}
.avatar
{
margin-bottom
:
10px
;
}
.logout-holder
{
text-align
:
center
;
}
}
}
}
...
...
@@ -188,9 +180,8 @@
bottom
:
0
;
width
:
100%
;
padding
:
10px
;
color
:
#fff
;
.
avatar
{
.
username
{
margin-top
:
5px
;
}
}
app/assets/stylesheets/themes/gitlab-theme.scss
View file @
61a3cd63
...
...
@@ -30,8 +30,12 @@
border-right
:
1px
solid
$color-darker
;
.sidebar-user
{
a
{
color
:
$color-light
;
color
:
$color-light
;
&
:hover
{
background-color
:
$color-dark
;
color
:
#FFF
;
text-decoration
:
none
;
}
}
}
...
...
app/views/layouts/_page.html.haml
View file @
61a3cd63
...
...
@@ -8,14 +8,10 @@
.collapse-nav
=
render
partial:
'layouts/collapse_button'
-
if
current_user
.sidebar-user
=
link_to
current_user
,
class:
'profile-pic'
,
id:
'profile-pic'
,
data:
{
toggle:
'tooltip'
,
placement:
'top'
}
do
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
,
class:
'avatar avatar s32'
=
link_to
current_user
,
class:
'sidebar-user'
do
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
,
class:
'avatar avatar s32'
.username
=
current_user
.
username
.logout-holder
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'top'
}
do
=
icon
(
'sign-out'
)
.content-wrapper
.container-fluid
.content
...
...
app/views/layouts/header/_default.html.haml
View file @
61a3cd63
...
...
@@ -39,5 +39,8 @@
%li
=
link_to
profile_path
,
title:
'Profile settings'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'cog fw'
)
%li
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'sign-out'
)
=
render
'shared/outdated_browser'
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