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
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
Show 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,15 +274,8 @@
...
@@ -274,15 +274,8 @@
.fade-right
{
.fade-right
{
@include
fade
(
left
);
@include
fade
(
left
);
right
:
58px
;
@media
(
min-width
:
$screen-xs-max
)
{
right
:
67px
;
}
@media
(
max-width
:
$screen-xs-min
)
{
right
:
0
;
right
:
0
;
}
}
}
.fade-left
{
.fade-left
{
@include
fade
(
right
);
@include
fade
(
right
);
...
@@ -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,7 +19,9 @@
...
@@ -19,7 +19,9 @@
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
}
%ul
.nav-links
#scrolling-tabs
.fade-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
=
icon
(
'bookmark fw'
)
=
icon
(
'bookmark fw'
)
...
@@ -129,3 +131,5 @@
...
@@ -129,3 +131,5 @@
%li
.hidden
%li
.hidden
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue'
do
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'shortcuts-new-issue'
do
Create a new issue
Create a new issue
.fade-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