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
1965ec63
Commit
1965ec63
authored
May 24, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fade to project nav; fix bug with controls
parent
1a1eaf48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
113 additions
and
103 deletions
+113
-103
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+14
-8
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+99
-95
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
1965ec63
...
@@ -274,14 +274,7 @@
...
@@ -274,14 +274,7 @@
.fade-right
{
.fade-right
{
@include
fade
(
left
);
@include
fade
(
left
);
right
:
58px
;
right
:
0
;
@media
(
min-width
:
$screen-xs-max
)
{
right
:
67px
;
}
@media
(
max-width
:
$screen-xs-min
)
{
right
:
0
;
}
}
}
.fade-left
{
.fade-left
{
...
@@ -310,6 +303,19 @@
...
@@ -310,6 +303,19 @@
}
}
}
}
}
}
.nav-control
{
.fade-right
{
right
:
58px
;
@media
(
min-width
:
$screen-xs-max
)
{
right
:
67px
;
}
@media
(
max-width
:
$screen-xs-min
)
{
right
:
0
;
}
}
}
}
}
.page-with-layout-nav
{
.page-with-layout-nav
{
...
...
app/views/layouts/nav/_project.html.haml
View file @
1965ec63
...
@@ -19,113 +19,117 @@
...
@@ -19,113 +19,117 @@
data:
{
confirm:
leave_project_message
(
@project
)
},
method: :delete
,
title:
'Leave project'
do
data:
{
confirm:
leave_project_message
(
@project
)
},
method: :delete
,
title:
'Leave project'
do
Leave Project
Leave Project
%ul
.nav-links
%div
{
class:
nav_control_class
}
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
'home'
})
do
%ul
.nav-links
#scrolling-tabs
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
.fade-left
=
icon
(
'bookmark fw'
)
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
'home'
})
do
%span
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
Project
=
icon
(
'bookmark fw'
)
=
nav_link
(
path:
'projects#activity'
)
do
=
link_to
activity_project_path
(
@project
),
title:
'Activity'
,
class:
'shortcuts-project-activity'
do
=
icon
(
'dashboard fw'
)
%span
Activity
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
),
title:
'Files'
,
class:
'shortcuts-tree'
do
=
icon
(
'files-o fw'
)
%span
%span
Files
Project
=
nav_link
(
path:
'projects#activity'
)
do
-
if
project_nav_tab?
:commits
=
link_to
activity_project_path
(
@project
),
title:
'Activity'
,
class:
'shortcuts-project-activity'
do
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches releases network)
)
do
=
icon
(
'dashboard fw'
)
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
=
icon
(
'history fw'
)
%span
%span
Commits
Activity
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
),
title:
'Files'
,
class:
'shortcuts-tree'
do
=
icon
(
'files-o fw'
)
%span
Files
-
if
project_nav_tab?
:pipelines
-
if
project_nav_tab?
:commits
=
nav_link
(
controller: :pipelines
)
do
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches releases network)
)
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipelines'
do
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
=
icon
(
'ship fw'
)
=
icon
(
'history fw'
)
%span
%span
Pipelines
Commits
%span
.badge.count.ci_counter
=
number_with_delimiter
(
@project
.
ci_commits
.
running_or_pending
.
count
)
-
if
project_nav_tab?
:build
s
-
if
project_nav_tab?
:pipeline
s
=
nav_link
(
controller:
%w(builds)
)
do
=
nav_link
(
controller: :pipelines
)
do
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-build
s'
do
=
link_to
project_pipelines_path
(
@project
),
title:
'Pipelines'
,
class:
'shortcuts-pipeline
s'
do
=
icon
(
'cubes
fw'
)
=
icon
(
'ship
fw'
)
%span
%span
Build
s
Pipeline
s
%span
.badge.count.builds_counter
=
number_with_delimiter
(
@project
.
builds
.
running_or_pending
.
count
(
:all
)
)
%span
.badge.count.ci_counter
=
number_with_delimiter
(
@project
.
ci_commits
.
running_or_pending
.
count
)
-
if
project_nav_tab?
:container_registry
-
if
project_nav_tab?
:builds
=
nav_link
(
controller:
%w(container_registry)
)
do
=
nav_link
(
controller:
%w(builds)
)
do
=
link_to
project_container_registry_path
(
@project
),
title:
'Container Registry'
,
class:
'shortcuts-container-registry'
do
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-builds'
do
=
icon
(
'hdd-o fw'
)
=
icon
(
'cubes fw'
)
%span
%span
Container Registry
Builds
%span
.badge.count.builds_counter
=
number_with_delimiter
(
@project
.
builds
.
running_or_pending
.
count
(
:all
))
-
if
project_nav_tab?
:graphs
-
if
project_nav_tab?
:container_registry
=
nav_link
(
controller:
%w(graphs
)
)
do
=
nav_link
(
controller:
%w(container_registry
)
)
do
=
link_to
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Graphs'
,
class:
'shortcuts-graphs
'
do
=
link_to
project_container_registry_path
(
@project
),
title:
'Container Registry'
,
class:
'shortcuts-container-registry
'
do
=
icon
(
'area-chart
fw'
)
=
icon
(
'hdd-o
fw'
)
%span
%span
Graphs
Container Registry
-
if
project_nav_tab?
:milestone
s
-
if
project_nav_tab?
:graph
s
=
nav_link
(
controller: :milestones
)
do
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
namespace_project_milestones_path
(
@project
.
namespace
,
@project
),
title:
'Milestone
s'
do
=
link_to
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Graphs'
,
class:
'shortcuts-graph
s'
do
=
icon
(
'clock-o
fw'
)
=
icon
(
'area-chart
fw'
)
%span
%span
Milestone
s
Graph
s
-
if
project_nav_tab?
:issues
-
if
project_nav_tab?
:milestones
=
nav_link
(
controller: :issues
)
do
=
nav_link
(
controller: :milestones
)
do
=
link_to
url_for_project_issues
(
@project
,
only_path:
true
),
title:
'Issues'
,
class:
'shortcuts-issues'
do
=
link_to
namespace_project_milestones_path
(
@project
.
namespace
,
@project
),
title:
'Milestones'
do
=
icon
(
'exclamation-circle fw'
)
=
icon
(
'clock-o fw'
)
%span
%span
Issues
Milestones
-
if
@project
.
default_issues_tracker?
%span
.badge.count.issue_counter
=
number_with_delimiter
(
@project
.
issues
.
visible_to_user
(
current_user
).
opened
.
count
)
-
if
project_nav_tab?
:merge_requests
-
if
project_nav_tab?
:issues
=
nav_link
(
controller: :merge_requests
)
do
=
nav_link
(
controller: :issues
)
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
link_to
url_for_project_issues
(
@project
,
only_path:
true
),
title:
'Issues'
,
class:
'shortcuts-issues'
do
=
icon
(
'tasks fw'
)
=
icon
(
'exclamation-circle fw'
)
%span
%span
Merge Requests
Issues
%span
.badge.count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
-
if
@project
.
default_issues_tracker?
%span
.badge.count.issue_counter
=
number_with_delimiter
(
@project
.
issues
.
visible_to_user
(
current_user
).
opened
.
count
)
-
if
project_nav_tab?
:labels
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :labels
)
do
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
namespace_project_labels_path
(
@project
.
namespace
,
@project
),
title:
'Labels'
do
=
link_to
namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
icon
(
'tags fw'
)
=
icon
(
'tasks fw'
)
%span
%span
Labels
Merge Requests
%span
.badge.count.merge_counter
=
number_with_delimiter
(
@project
.
merge_requests
.
opened
.
count
)
-
if
project_nav_tab?
:wiki
-
if
project_nav_tab?
:labels
=
nav_link
(
controller: :wiki
s
)
do
=
nav_link
(
controller: :label
s
)
do
=
link_to
get_project_wiki_path
(
@project
),
title:
'Wiki'
,
class:
'shortcuts-wiki
'
do
=
link_to
namespace_project_labels_path
(
@project
.
namespace
,
@project
),
title:
'Labels
'
do
=
icon
(
'book
fw'
)
=
icon
(
'tags
fw'
)
%span
%span
Wiki
Labels
-
if
project_nav_tab?
:snippets
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :snippets
)
do
=
nav_link
(
controller: :wikis
)
do
=
link_to
namespace_project_snippets_path
(
@project
.
namespace
,
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
=
link_to
get_project_wiki_path
(
@project
),
title:
'Wiki'
,
class:
'shortcuts-wiki'
do
=
icon
(
'clipboard fw'
)
=
icon
(
'book fw'
)
%span
%span
Snippets
Wiki
-
if
project_nav_tab?
:snippets
=
nav_link
(
controller: :snippets
)
do
=
link_to
namespace_project_snippets_path
(
@project
.
namespace
,
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
=
icon
(
'clipboard fw'
)
%span
Snippets
-# Global shortcut to network page for compatibility
-
if
project_nav_tab?
:network
%li
.hidden
=
link_to
namespace_project_network_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Network'
,
class:
'shortcuts-network'
do
Network
-# Global shortcut to network page for compatibility
-# Shortcut to create a new issue
-
if
project_nav_tab?
:network
%li
.hidden
%li
.hidden
=
link_to
n
amespace_project_network_path
(
@project
.
namespace
,
@project
,
current_ref
),
title:
'Network'
,
class:
'shortcuts-network
'
do
=
link_to
n
ew_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue
'
do
Network
Create a new issue
-# Shortcut to create a new issue
.fade-right
%li
.hidden
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue'
do
Create a new issue
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