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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7b71a9e2
Commit
7b71a9e2
authored
Dec 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add icons to project sidenav
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5f797be0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
6 deletions
+40
-6
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+11
-0
app/assets/stylesheets/sections/sidebar.scss
app/assets/stylesheets/sections/sidebar.scss
+6
-0
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+23
-6
No files found.
app/assets/stylesheets/sections/events.scss
View file @
7b71a9e2
...
@@ -171,6 +171,17 @@
...
@@ -171,6 +171,17 @@
}
}
}
}
.project
.event_filter
{
position
:
static
;
float
:
left
;
width
:
100%
;
margin-left
:
0
;
a
{
margin-right
:
10px
;
width
:
50px
;
}
}
/*
/*
* Last push widget
* Last push widget
*/
*/
...
...
app/assets/stylesheets/sections/sidebar.scss
View file @
7b71a9e2
...
@@ -111,6 +111,11 @@ body.project {
...
@@ -111,6 +111,11 @@ body.project {
&
:active
,
&
:focus
{
&
:active
,
&
:focus
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
i
{
width
:
20px
;
color
:
#999
;
}
}
}
}
}
...
@@ -153,6 +158,7 @@ body.project {
...
@@ -153,6 +158,7 @@ body.project {
.content-wrapper
{
.content-wrapper
{
padding
:
20px
;
padding
:
20px
;
border-left
:
1px
solid
#EAEAEA
;
}
}
}
}
...
...
app/views/layouts/nav/_project.html.haml
View file @
7b71a9e2
%ul
.project-navigation.nav.nav-sidebar.navbar-collapse.collapse
%ul
.project-navigation.nav.nav-sidebar.navbar-collapse.collapse
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
nav_link
(
path:
'projects#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
%i
.fa.fa-dashboard
Project
Project
-
if
project_nav_tab?
:files
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
=
link_to
'Files'
,
project_tree_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-tree'
=
link_to
project_tree_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-tree'
do
%i
.fa.fa-files-o
Files
-
if
project_nav_tab?
:commits
-
if
project_nav_tab?
:commits
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches)
)
do
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches)
)
do
=
link_to
"Commits"
,
project_commits_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-commits'
=
link_to
project_commits_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-commits'
do
%i
.fa.fa-history
Commits
-
if
project_nav_tab?
:network
-
if
project_nav_tab?
:network
=
nav_link
(
controller:
%w(network)
)
do
=
nav_link
(
controller:
%w(network)
)
do
=
link_to
"Network"
,
project_network_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-network'
=
link_to
project_network_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-network'
do
%i
.fa.fa-code-fork
Network
-
if
project_nav_tab?
:graphs
-
if
project_nav_tab?
:graphs
=
nav_link
(
controller:
%w(graphs)
)
do
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
"Graphs"
,
project_graph_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-graphs'
=
link_to
project_graph_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-graphs'
do
%i
.fa.fa-area-chart
Graphs
-
if
project_nav_tab?
:issues
-
if
project_nav_tab?
:issues
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
url_for_project_issues
,
class:
'shortcuts-issues'
do
=
link_to
url_for_project_issues
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
Issues
Issues
-
if
@project
.
used_default_issues_tracker?
-
if
@project
.
used_default_issues_tracker?
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
...
@@ -28,20 +39,26 @@
...
@@ -28,20 +39,26 @@
-
if
project_nav_tab?
:merge_requests
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :merge_requests
)
do
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
class:
'shortcuts-merge_requests'
do
=
link_to
project_merge_requests_path
(
@project
),
class:
'shortcuts-merge_requests'
do
%i
.fa.fa-tasks
Merge Requests
Merge Requests
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
project_nav_tab?
:wiki
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
nav_link
(
controller: :wikis
)
do
=
link_to
'Wiki'
,
project_wiki_path
(
@project
,
:home
),
class:
'shortcuts-wiki'
=
link_to
project_wiki_path
(
@project
,
:home
),
class:
'shortcuts-wiki'
do
%i
.fa.fa-book
Wiki
-
if
project_nav_tab?
:snippets
-
if
project_nav_tab?
:snippets
=
nav_link
(
controller: :snippets
)
do
=
nav_link
(
controller: :snippets
)
do
=
link_to
'Snippets'
,
project_snippets_path
(
@project
),
class:
'shortcuts-snippets'
=
link_to
project_snippets_path
(
@project
),
class:
'shortcuts-snippets'
do
%i
.fa.fa-file-text-o
Snippets
-
if
project_nav_tab?
:settings
-
if
project_nav_tab?
:settings
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item"
})
do
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item"
})
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab no-highlight"
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab no-highlight"
do
%i
.fa.fa-cogs
Settings
Settings
%i
.fa.fa-angle-down
%i
.fa.fa-angle-down
-
if
defined?
(
settings
)
&&
settings
-
if
defined?
(
settings
)
&&
settings
...
...
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