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
Jérome Perrin
gitlab-ce
Commits
18dd525d
Commit
18dd525d
authored
Apr 01, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Concept of 2 level navigation sidebar
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
de1c8164
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
155 additions
and
113 deletions
+155
-113
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+53
-0
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+102
-113
No files found.
app/assets/stylesheets/framework/sidebar.scss
View file @
18dd525d
...
...
@@ -309,3 +309,56 @@
padding-right
:
$sidebar_collapsed_width
;
}
}
.page-sidebar-expanded
{
.complex-sidebar
{
margin-bottom
:
100px
;
display
:
inline-block
;
.nav-sidebar
{
margin-bottom
:
0
;
}
.nav-primary
{
width
:
60px
;
float
:
left
;
.nav-sidebar
{
width
:
60px
;
li
a
{
width
:
60px
;
span
{
display
:
none
;
}
}
}
}
.nav-secondary
{
border-left
:
1px
solid
rgba
(
255
,
255
,
255
,
0
.1
);
float
:
left
;
width
:
168px
;
.nav-sidebar
{
width
:
168px
;
li
a
{
width
:
168px
;
i
{
display
:
none
;
}
}
}
}
}
}
.page-sidebar-collapsed
{
.nav-secondary
{
display
:
none
;
transition-duration
:
.3s
;
}
}
app/views/layouts/nav/_project.html.haml
View file @
18dd525d
%ul
.nav.nav-sidebar
-
if
@project
.
group
=
nav_link
do
=
link_to
group_path
(
@project
.
group
),
title:
'Go to group'
,
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
%span
Go to group
-
else
=
nav_link
do
=
link_to
root_path
,
title:
'Go to dashboard'
,
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
%span
Go to dashboard
%li
.separate-item
.complex-sidebar
.nav-primary
=
render
'layouts/nav/dashboard'
.nav-secondary
%ul
.nav.nav-sidebar
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
=
icon
(
'bookmark fw'
)
...
...
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