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
Boxiang Sun
gitlab-ce
Commits
dcf8304b
Commit
dcf8304b
authored
Jun 21, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '18881-horizontal-nav-arrow'
parents
408110f8
e3d9d46b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
0 deletions
+28
-0
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+15
-0
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+2
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-0
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+2
-0
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+2
-0
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+2
-0
app/views/shared/_event_filter.html.haml
app/views/shared/_event_filter.html.haml
+2
-0
No files found.
CHANGELOG
View file @
dcf8304b
...
@@ -144,6 +144,7 @@ v 8.9.0 (unreleased)
...
@@ -144,6 +144,7 @@ v 8.9.0 (unreleased)
- ExtractsPath get ref_names from repository cache, if not there access git.
- ExtractsPath get ref_names from repository cache, if not there access git.
- Cache user todo counts from TodoService
- Cache user todo counts from TodoService
- Ensure Todos counters doesn't count Todos for projects pending delete
- Ensure Todos counters doesn't count Todos for projects pending delete
- Add left/right arrows horizontal navigation
v 8.8.5
v 8.8.5
- Import GitHub repositories respecting the API rate limit !4166
- Import GitHub repositories respecting the API rate limit !4166
...
...
app/assets/stylesheets/framework/nav.scss
View file @
dcf8304b
...
@@ -18,6 +18,13 @@
...
@@ -18,6 +18,13 @@
opacity
:
0
;
opacity
:
0
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
}
}
.fa
{
position
:
relative
;
top
:
3px
;
font-size
:
13px
;
color
:
$btn-placeholder-gray
;
}
}
}
@mixin
scrolling-links
()
{
@mixin
scrolling-links
()
{
...
@@ -320,11 +327,19 @@
...
@@ -320,11 +327,19 @@
.fade-right
{
.fade-right
{
@include
fade
(
left
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
@include
fade
(
left
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
right
:
0
;
right
:
0
;
.fa
{
right
:
-7px
;
}
}
}
.fade-left
{
.fade-left
{
@include
fade
(
right
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
@include
fade
(
right
,
rgba
(
250
,
250
,
250
,
0
.4
)
,
$background-color
);
left
:
0
;
left
:
0
;
.fa
{
left
:
-7px
;
}
}
}
li
{
li
{
...
...
app/views/layouts/nav/_admin.html.haml
View file @
dcf8304b
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds runners)
,
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
%span
%span
...
@@ -37,3 +38,4 @@
...
@@ -37,3 +38,4 @@
%span
%span
Spam Logs
Spam Logs
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
app/views/layouts/nav/_group.html.haml
View file @
dcf8304b
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
%span
%span
...
@@ -32,3 +33,4 @@
...
@@ -32,3 +33,4 @@
%span
%span
Members
Members
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
app/views/layouts/nav/_profile.html.haml
View file @
dcf8304b
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
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
%span
%span
...
@@ -44,3 +45,4 @@
...
@@ -44,3 +45,4 @@
%span
%span
Audit Log
Audit Log
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
app/views/layouts/nav/_project.html.haml
View file @
dcf8304b
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
%div
{
class:
nav_control_class
}
%div
{
class:
nav_control_class
}
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
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
%span
%span
...
@@ -110,3 +111,4 @@
...
@@ -110,3 +111,4 @@
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
Commits
Commits
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
app/views/projects/commits/_head.html.haml
View file @
dcf8304b
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
.nav-links.sub-nav.scrolling-tabs
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
(
container_class
)
}
%ul
{
class:
(
container_class
)
}
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
)
do
=
link_to
project_files_path
(
@project
)
do
Files
Files
...
@@ -26,3 +27,4 @@
...
@@ -26,3 +27,4 @@
=
link_to
namespace_project_tags_path
(
@project
.
namespace
,
@project
)
do
=
link_to
namespace_project_tags_path
(
@project
.
namespace
,
@project
)
do
Tags
Tags
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
app/views/shared/_event_filter.html.haml
View file @
dcf8304b
%ul
.nav-links.event-filter.scrolling-tabs
%ul
.nav-links.event-filter.scrolling-tabs
.fade-left
.fade-left
=
icon
(
'arrow-left'
)
=
event_filter_link
EventFilter
.
push
,
'Push events'
=
event_filter_link
EventFilter
.
push
,
'Push events'
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
=
event_filter_link
EventFilter
.
team
,
'Team'
=
event_filter_link
EventFilter
.
team
,
'Team'
.fade-right
.fade-right
=
icon
(
'arrow-right'
)
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