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
ef722faa
Commit
ef722faa
authored
Jun 27, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add context header to sidebar
parent
fb093e8b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
1 deletion
+43
-1
app/assets/stylesheets/new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+25
-1
app/views/layouts/nav/_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+4
-0
app/views/layouts/nav/_new_group_sidebar.html.haml
app/views/layouts/nav/_new_group_sidebar.html.haml
+5
-0
app/views/layouts/nav/_new_profile_sidebar.html.haml
app/views/layouts/nav/_new_profile_sidebar.html.haml
+4
-0
app/views/layouts/nav/_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+5
-0
No files found.
app/assets/stylesheets/new_sidebar.scss
View file @
ef722faa
...
@@ -5,17 +5,41 @@
...
@@ -5,17 +5,41 @@
$new-sidebar-width
:
220px
;
$new-sidebar-width
:
220px
;
.page-with-new-sidebar
{
.page-with-new-sidebar
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
padding-left
:
$new-sidebar-width
;
padding-left
:
$new-sidebar-width
;
}
}
// Override position: absolute
.right-sidebar
{
.right-sidebar
{
position
:
fixed
;
position
:
fixed
;
height
:
100%
;
height
:
100%
;
}
}
}
}
.context-header
{
background-color
:
$gray-normal
;
border-bottom
:
1px
solid
$border-color
;
display
:
flex
;
align-items
:
center
;
padding
:
10px
14px
;
.avatar-container
{
flex
:
0
0
40px
;
}
}
.settings-avatar
{
background-color
:
$white-light
;
.fa-wrench
{
font-size
:
20px
;
width
:
100%
;
color
:
$gl-text-color-light
;
text-align
:
center
;
align-self
:
center
;
}
}
.nav-sidebar
{
.nav-sidebar
{
position
:
fixed
;
position
:
fixed
;
z-index
:
400
;
z-index
:
400
;
...
...
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
ef722faa
.nav-sidebar
.nav-sidebar
.context-header
.avatar-container.s40.settings-avatar
=
icon
(
'wrench'
)
.project-title
Admin Area
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners cohorts)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners cohorts)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
...
...
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @
ef722faa
.nav-sidebar
.nav-sidebar
.context-header
.avatar-container.s40.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s40 avatar-tile"
.group-title
=
@group
.
name
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'groups#subgroups'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'groups#subgroups'
],
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
...
...
app/views/layouts/nav/_new_profile_sidebar.html.haml
View file @
ef722faa
.nav-sidebar
.nav-sidebar
.context-header
.avatar-container.s40.settings-avatar
=
icon
(
'wrench'
)
.project-title
Settings
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @
ef722faa
.nav-sidebar
.nav-sidebar
-
can_edit
=
can?
(
current_user
,
:admin_project
,
@project
)
-
can_edit
=
can?
(
current_user
,
:admin_project
,
@project
)
.context-header
.avatar-container.s40.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s40 avatar-tile'
)
.project-title
=
@project
.
name
%ul
.sidebar-top-level-items
%ul
.sidebar-top-level-items
=
nav_link
(
path:
[
'projects#show'
,
'projects#activity'
,
'cycle_analytics#show'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'projects#show'
,
'projects#activity'
,
'cycle_analytics#show'
],
html_options:
{
class:
'home'
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
...
...
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